风险管理3月15日提交代码-liu.bolan-期货交易请求

RMA/app/src/main/java/cn/muchinfo/rma/business/management/BusinessManager.kt

@@ -53,7 +53,7 @@ class BusinessManager {
     ) {
         MyOkHttpUtils().query(
             URL = SPUtils.getInstance()
-                .getString(Constant.goCommonSearchUrl) + "/Ermcp/QueryBusinessJsEx",
+                    .getString(Constant.goCommonSearchUrl) + "/Ermcp/QueryBusinessJsEx",
             params = params,
             type = "1",
             callback = object : ResponseCallback<BaseResult<List<BusinessData>>>() {

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

@@ -61,13 +61,17 @@ fun String.channelbuildtype() : String{
  * @receiver String
  * @return String
  */
-fun String.toShowTime() : String{
+fun String.toShowTime(format : String = "yyyy-MM-dd HH:mm:ss") : String{
     if (this.isNullOrEmpty()){
         return "--"
     }
     val sdf = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss+08:00", Locale.CHINA)
-    val sdf1 = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA)
-    return sdf1.format(sdf.parse(this)!!)
+    val sdf1 = SimpleDateFormat(format, Locale.CHINA)
+    var timeString = sdf1.format(sdf.parse(this)!!)
+    if (TimeUtils.isToday(timeString)){
+        timeString = timeString.split(" ").get(1)
+    }
+    return timeString
 }
 
 /**

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

@@ -65,7 +65,10 @@ data class BusinessData(
     val pricedQty : String? = "",//点价数量(非必填)
     var indexSelect : Int = 0,
     val reckontype : String? = "",//结算类型
-    val reckonvalue : String? = ""//值
+    val reckonvalue : String? = "",//值
+    val wrstandardname : String? = "",//现货品种
+    val wrstandardcode : String? = "",//现货品种代码
+    val wrstandardid : String? = ""//现货品种ID
 
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
@@ -100,6 +103,9 @@ data class BusinessData(
         parcel.readString(),
         parcel.readInt(),
         parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readString()
     ) {
     }
@@ -137,6 +143,9 @@ data class BusinessData(
         parcel.writeInt(indexSelect)
         parcel.writeString(reckontype)
         parcel.writeString(reckonvalue)
+        parcel.writeString(wrstandardname)
+        parcel.writeString(wrstandardcode)
+        parcel.writeString(wrstandardid)
     }
 
     override fun describeContents(): Int {

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

@@ -53,7 +53,10 @@ data class FinancialManageData(
     val kxtype : String? = "",//款项类型 1-收付款(PayAmount字段有值) 2-退款(DeductAmount字段有值) 3-收付款/退款(2个字段都有)
     val payamount : String? = "",//收付款(非必填)
     var indexSelect : Int = 0,
-    val deductamount : String? = ""
+    val deductamount : String? = "",
+    val wrstandardname : String? = "",//现货品种
+    val wrstandardcode : String? = "",//现货品种代码
+    val wrstandardid : String? = ""//现货品种ID
 ) : Parcelable{
     constructor(parcel: Parcel) : this(
         parcel.readString(),
@@ -80,6 +83,9 @@ data class FinancialManageData(
         parcel.readString(),
         parcel.readString(),
         parcel.readInt(),
+        parcel.readString(),
+        parcel.readString(),
+        parcel.readString(),
         parcel.readString()
     ) {
     }
@@ -110,6 +116,9 @@ data class FinancialManageData(
         parcel.writeString(payamount)
         parcel.writeInt(indexSelect)
         parcel.writeString(deductamount)
+        parcel.writeString(wrstandardname)
+        parcel.writeString(wrstandardcode)
+        parcel.writeString(wrstandardid)
     }
 
     override fun describeContents(): Int {
@@ -126,5 +135,4 @@ data class FinancialManageData(
         }
     }
 
-
 }

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

@@ -145,6 +145,8 @@ class FutureFragment : BaseFragment<FutureViewModel>() {
              */
             override fun onDoubleTap(index: Int) {}
         })
+
+        viewModel.initAccountData()//初始化页面时进行一次资金账号的拿取
     }
 
     private fun setHeadView() {

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

@@ -6,6 +6,8 @@ import android.view.Gravity
 import androidx.fragment.app.Fragment
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.data.NoticeData
+import cn.muchinfo.rma.global.isShowTimeString
+import cn.muchinfo.rma.global.toShowTime
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
@@ -53,7 +55,7 @@ class AnnouncementViewHolder(
 
                 textView {
                     data.bindOptional(context){
-                        text = it?.createtime
+                        text = it?.createtime?.toShowTime("yyyy-MM-dd HH:mm")
                     }
                     textColorInt = R.color.text_hit_color
                     textSizeAuto = 26

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

@@ -166,7 +166,7 @@ class MidpointsAuditActivity : BaseActivity<BusinessManagementViewModel>(){
                                     linearLayout {
                                         emptyView()
                                         textView {
-                                            text = data.goodsname
+                                            text = data.wrstandardname
                                             textSizeAuto = 29
                                             textColorInt = R.color.rma_black_33
                                         }.lparams(wrapContent, wrapContent) {

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

@@ -164,7 +164,7 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                                     }.lparams(autoSize(450), wrapContent)
                                     linearLayout {
                                         textView {
-                                            text = "商品名称"
+                                            text = "现货品种"
                                             textColorInt = R.color.p_normal_summary_txt_color
                                             textSizeAuto = 29
                                         }.lparams(wrapContent, wrapContent) {
@@ -174,7 +174,7 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                                         linearLayout {
                                             emptyView()
                                             textView {
-                                                text = data.goodsname
+                                                text = data.wrstandardname
                                                 textSizeAuto = 29
                                                 textColorInt = R.color.rma_black_33
                                             }.lparams(wrapContent, wrapContent) {
@@ -193,7 +193,6 @@ class SettlementAuditActivity : BaseActivity<BusinessManagementViewModel>() {
                                     topMargin = autoSize(30)
                                 }
 
-
                                 textView {
                                     text = "待审核登记信息"
                                     textColorInt = R.color.rma_blue_color

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

@@ -239,7 +239,7 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
 
                             editText {
                                 if (type == "2" || type == "3" || type == "5") {
-                                    setText(data.needhedgeratio)
+                                    setText(data.needhedgeratio?.toDouble()?.times(100).toString())
                                 }
                                 hedge_ratio_edtittext = this
 
@@ -325,6 +325,8 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                     remark = remask_edittext.text.toString(),
                                     areauserid = GlobalDataCollection.instance?.loginRsp?.userID?.toLong()
                                         ?: 0,
+                                    creatorid = GlobalDataCollection.instance?.loginRsp?.userID?.toLong()
+                                        ?: 0,
                                     needhedgeratio = hedge_ratio_edtittext.text.toString()
                                         .toDouble().div(100)
                                 ) {
@@ -334,7 +336,7 @@ class AddHedgeGoodsActivity : BaseActivity<CommodityInformationViewModel>() {
                                 viewModel.requestErmsMiddelGoodsEditReq(
                                     middlegoodsid = data.middlegoodsid?.toLong() ?: 0,
                                     needhedgeratio = hedge_ratio_edtittext.text.toString()
-                                        .toDouble() ?: 0.0,
+                                        .toDouble().div(100),
                                     goodsgroupid = data.goodsgroupid?.toLong() ?: 0,
                                     areauserid = GlobalDataCollection.instance?.loginRsp?.userID?.toLong()
                                         ?: 0,

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

@@ -101,7 +101,7 @@ class CommodityMiddleViewHolder(
                  linearLayout {
                      textView {
                          data.bindOptional(context){
-                             text = it?.needhedgeratio + "%"
+                             text = it?.needhedgeratio?.toPercentage()
                          }
                          textColorInt = R.color.rma_black_33
                          textSizeAuto = 34

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

@@ -196,7 +196,7 @@ class GoodsDetailsUI(
             viewItemUI()
             contentItem(itemTile = "单位",itemContent = data.enumdicname ?: "")
             viewItemUI()
-            contentItem(itemTile = "套保比例",itemContent = data.needhedgeratio ?: "")
+            contentItem(itemTile = "套保比例",itemContent = data.needhedgeratio?.toDouble()?.times(100).toString() ?: "")
             viewModel.avalidGoodsDetailsData.bindOptional(context){list ->
                 list?.forEach {
                     viewItemUI()

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

@@ -57,7 +57,9 @@ class InsuredVarietyViewHolder(
                 }
 
                 textView {
-                    text = "套保品种"
+                    data.bindOptional(context) {
+                        text = "套保品种"  + dataIndex.plus(1)
+                    }
                     textSizeAuto = 31
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent) {

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

@@ -54,7 +54,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
         intent.getStringExtra("operationtype")
     }
 
-    private val data : ContractData by lazy {
+    private val data: ContractData by lazy {
         intent.getParcelableExtra<ContractData>("data") as ContractData
     }
 
@@ -67,84 +67,121 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
      * 标仓系数输入值
      */
     lateinit var coefficientWarehouse: EditText
+
     /** 商品规格 ***/
-    lateinit var productSpecifications : EditText
+    lateinit var productSpecifications: EditText
+
     /** 数量 **/
-    private lateinit var number_Edittext : EditText
+    private lateinit var number_Edittext: EditText
+
     /** 输入价格 **/
-    private lateinit var price_edittext : EditText
+    private lateinit var price_edittext: EditText
+
     /** 输入升贴水 **/
-    private lateinit var liter_discount_edittext : EditText
+    private lateinit var liter_discount_edittext: EditText
+
     /** 一口价时的金额输入 **/
-    private lateinit var price_edittext_one : TextView
+    private lateinit var price_edittext_one: TextView
+
     /** 输入暂定价 **/
-    lateinit var temperary_edittext : EditText
+    lateinit var temperary_edittext: EditText
+
     /** 保证金 **/
-    lateinit var margin_edittext : EditText
+    lateinit var margin_edittext: EditText
+
     /** 备注 **/
-    lateinit var remask_edittext : EditText
+    lateinit var remask_edittext: EditText
+
     /**
      * 本页面选择的合同类型
      */
     var contractType: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的客户 */
-    val selectCustomer : MutableLiveData<SelectData> = MutableLiveData()
+    val selectCustomer: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的现货商品类型 */
-    val selectWrStandardData : MutableLiveData<SelectData> = MutableLiveData()
+    val selectWrStandardData: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的型号类型 **/
-    val selectWrStandModel : MutableLiveData<SelectData> = MutableLiveData()
+    val selectWrStandModel: MutableLiveData<SelectData> = MutableLiveData()
 
     /** 选择的品牌 ***/
-    val selectWrStandBrand : MutableLiveData<SelectData> = MutableLiveData()
+    val selectWrStandBrand: MutableLiveData<SelectData> = MutableLiveData()
+
+    /** 点价，暂定价选的点价合约 **/
+    val selectGoodsList: MutableLiveData<SelectData> = MutableLiveData()
 
     /**
      * 产品类型
      */
     val productType by lazy {
-        arrayListOf(SelectData(MTPEnums.STANDARD_OF_THE_WAREHOUSE.toString(),"标准仓单"),
-            SelectData(MTPEnums.SUCH_AS_THS.toString(),"等标"),
-            SelectData(MTPEnums.NON_STANDARD.toString(),"非标")
+        arrayListOf(
+            SelectData(MTPEnums.STANDARD_OF_THE_WAREHOUSE.toString(), "标准仓单"),
+            SelectData(MTPEnums.SUCH_AS_THS.toString(), "等标"),
+            SelectData(MTPEnums.NON_STANDARD.toString(), "非标")
         )
     }
+
     /** 选择的产品类型 **/
-    val selectProductType : MutableLiveData<SelectData> = MutableLiveData()
+    val selectProductType: MutableLiveData<SelectData> = MutableLiveData()
 
     /**
      * 点价类型列表
      */
     val priceType by lazy {
-         arrayListOf(SelectData(MTPEnums.PRICE.toString(),"一口价"),
-            SelectData(MTPEnums.SOME_PRICE.toString(),"点价"),
-            SelectData(MTPEnums.TEMPORARY_PRICE.toString(),"暂定价")
+        arrayListOf(
+            SelectData(MTPEnums.PRICE.toString(), "一口价"),
+            SelectData(MTPEnums.SOME_PRICE.toString(), "点价"),
+            SelectData(MTPEnums.TEMPORARY_PRICE.toString(), "暂定价")
         )
     }
 
     /** 点价期 **/
-    val midpointsPeriodTime : MutableLiveData<String> = MutableLiveData()
+    val midpointsPeriodTime: MutableLiveData<String> = MutableLiveData()
 
     /** 交收期 */
-    val deliveryPeriodTime : MutableLiveData<String> = MutableLiveData()
-
-    fun initData(){
-        if (operationtype == "1"){//新增合同市需要初始化的数据
-            contractType.postValue(SelectData(
-                id = MTPEnums.CONTRACT_TYPE_BUY.toString(),
-                value = "采购合同"
-            ))//初始化一个合同类型
-            viewModel.pricingType.postValue(SelectData(id = "1",value = "一口价"))//初始化一个价格类型
-        }else{//修改或者重新提交时需要初始化的数据
-            contractType.postValue(SelectData(id = data.contracttype.toString(),value = if (data.contracttype == "1"){
-                "采购合同"
-            }else{
-                "销售合同"
-            }))
-            viewModel.pricingType.postValue(SelectData(id = data.pricetype.toString(),value = ViewEnumUtils.getPriceType(data.pricetype ?: "")))
-            selectWrStandardData.postValue(SelectData(id = data.deliverygoodscode.toString(),value = data.deliverygoodsname.toString(),deliverygoodsid = data.deliverygoodsid.toString()))
+    val deliveryPeriodTime: MutableLiveData<String> = MutableLiveData()
+
+    fun initData() {
+        if (operationtype == "1") {//新增合同市需要初始化的数据
+            contractType.postValue(
+                SelectData(
+                    id = MTPEnums.CONTRACT_TYPE_BUY.toString(),
+                    value = "采购合同"
+                )
+            )//初始化一个合同类型
+            viewModel.pricingType.postValue(SelectData(id = "1", value = "一口价"))//初始化一个价格类型
+        } else {//修改或者重新提交时需要初始化的数据
+            contractType.postValue(
+                SelectData(
+                    id = data.contracttype.toString(), value = if (data.contracttype == "1") {
+                        "采购合同"
+                    } else {
+                        "销售合同"
+                    }
+                )
+            )
+            viewModel.pricingType.postValue(
+                SelectData(
+                    id = data.pricetype.toString(),
+                    value = ViewEnumUtils.getPriceType(data.pricetype ?: "")
+                )
+            )
+            selectWrStandardData.postValue(
+                SelectData(
+                    id = data.deliverygoodscode.toString(),
+                    value = data.deliverygoodsname.toString(),
+                    deliverygoodsid = data.deliverygoodsid.toString()
+                )
+            )
             viewModel.queryWrStandardDetail(data.deliverygoodscode ?: "")
-            selectProductType.postValue(SelectData(id = data.producttype.toString(),value = ViewEnumUtils.getProductType(data.producttype.toString())))
+            selectProductType.postValue(
+                SelectData(
+                    id = data.producttype.toString(),
+                    value = ViewEnumUtils.getProductType(data.producttype.toString())
+                )
+            )
 
 //            selectWrStandModel.postValue(SelectData(id = data.spotgoodsdesc.toString()))
         }
@@ -153,7 +190,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         verticalLayout {
-            createLoadingDialog(hintStr = "").bindTaskStatus(context,viewModel.loadingDialogStatus)
+            createLoadingDialog(hintStr = "").bindTaskStatus(context, viewModel.loadingDialogStatus)
             background = resources.getDrawable(R.color.segtabment_bg_color)
             viewModel.queryUserInfo()
             viewModel.queryWrStandardList()
@@ -161,7 +198,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = "新增采购合同"
+                    text = "新增合同"
                 }
             }
 
@@ -267,7 +304,9 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
                                 if (contractType.value?.id == "-1") {
-                                    val selectDataList = viewModel.setSelectCustomerList(viewModel.normalUserInfoList.value ?: arrayListOf())
+                                    val selectDataList = viewModel.setSelectCustomerList(
+                                        viewModel.normalUserInfoList.value ?: arrayListOf()
+                                    )
                                     creatBottomSheetDialog("请选择客户", selectDataList) {
                                         selectCustomer.postValue(this)
                                     }
@@ -308,8 +347,8 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                     }
                                 }
 
-                                selectCustomer.bindOptional(context){
-                                    if (contractType.value?.id == "-1"){
+                                selectCustomer.bindOptional(context) {
+                                    if (contractType.value?.id == "-1") {
                                         text = it?.value
                                     }
 
@@ -342,7 +381,9 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             background = resources.getDrawable(R.color.white)
                             onThrottleFirstClick {
                                 if (contractType.value?.id == "1") {
-                                    val selectDataList = viewModel.setSelectCustomerList(viewModel.normalUserInfoList.value ?: arrayListOf())
+                                    val selectDataList = viewModel.setSelectCustomerList(
+                                        viewModel.normalUserInfoList.value ?: arrayListOf()
+                                    )
                                     creatBottomSheetDialog("请选择客户", selectDataList) {
                                         selectCustomer.postValue(this)
                                     }
@@ -381,8 +422,8 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                         "请选择客户"
                                     }
                                 }
-                                selectCustomer.bindOptional(context){
-                                    if (contractType.value?.id == "1"){
+                                selectCustomer.bindOptional(context) {
+                                    if (contractType.value?.id == "1") {
                                         text = it?.value
                                         textColorInt = R.color.rma_black_33
                                     }
@@ -502,7 +543,11 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                     val path = imageString.value.guard {
                                         return@onThrottleFirstClick
                                     }
-                                    PhotoUtils().showImageViewer(this@AddContractActivity, 1, arrayListOf(path))
+                                    PhotoUtils().showImageViewer(
+                                        this@AddContractActivity,
+                                        1,
+                                        arrayListOf(path)
+                                    )
                                 }
                                 textResource = R.string.check_the_attachment
                                 textColorInt = R.color.rma_yellow_text_color
@@ -518,7 +563,12 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             background = resources.getDrawable(R.color.white)
                             gravity = Gravity.CENTER_VERTICAL
                             onThrottleFirstClick {
-                                creatBottomSheetDialog("请选择现货品种", viewModel.selectSpotVarietiesList(viewModel.wrStandardDataList.value ?: arrayListOf())) {
+                                creatBottomSheetDialog(
+                                    "请选择现货品种",
+                                    viewModel.selectSpotVarietiesList(
+                                        viewModel.wrStandardDataList.value ?: arrayListOf()
+                                    )
+                                ) {
                                     selectWrStandardData.postValue(this)
                                     viewModel.queryWrStandardDetail(this.id)
                                 }
@@ -540,7 +590,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectWrStandardData.bindOptional(context){
+                                selectWrStandardData.bindOptional(context) {
                                     text = it?.value
                                     textColorInt = R.color.rma_black_33
                                 }
@@ -587,7 +637,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectProductType.bindOptional(context){
+                                selectProductType.bindOptional(context) {
                                     text = it?.value
                                     textColorInt = R.color.rma_black_33
                                 }
@@ -631,7 +681,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             editText {
 
                                 coefficientWarehouse = this
-                                if (data.convertfactor?.isNotEmpty() == true){
+                                if (data.convertfactor?.isNotEmpty() == true) {
                                     coefficientWarehouse.setText(data.convertfactor.toString())
                                 }
                                 hint = "请输入标仓系数"
@@ -681,7 +731,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectWrStandModel.bindOptional(context){
+                                selectWrStandModel.bindOptional(context) {
                                     text = it?.value
                                     textColorInt = R.color.rma_black_33
                                 }
@@ -736,7 +786,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectWrStandBrand.bindOptional(context){
+                                selectWrStandBrand.bindOptional(context) {
                                     text = it?.value
                                     textColorInt = R.color.rma_black_33
                                 }
@@ -779,6 +829,11 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
                             editText {
                                 productSpecifications = this
+                                selectWrStandardData.bindOptional(context){
+                                    if (it?.id?.isNotEmpty() == true){
+                                        setText("默认")
+                                    }
+                                }
                                 hint = "请输入商品规格"
                                 background = null
                                 inputType = EditorInfo.TYPE_CLASS_TEXT
@@ -860,14 +915,17 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             editText {
                                 textChangedListener {
                                     afterTextChanged {
-                                        if (it.toString().isNotEmpty()){
-                                            if (price_edittext.text.toString().isNotEmpty()){
-                                                price_edittext_one.text = price_edittext.text.toString().toDouble().times(number_Edittext.text.toString().toDouble()).toString()
+                                        if (it.toString().isNotEmpty()) {
+                                            if (price_edittext.text.toString().isNotEmpty()) {
+                                                price_edittext_one.text =
+                                                    price_edittext.text.toString().toDouble().times(
+                                                        number_Edittext.text.toString().toDouble()
+                                                    ).toString()
                                             }
                                         }
                                     }
                                 }
-                                if (operationtype == "2"){
+                                if (operationtype == "2") {
                                     setText(data.qty)
                                 }
                                 number_Edittext = this
@@ -883,7 +941,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                selectWrStandardData.bindOptional(context){
+                                selectWrStandardData.bindOptional(context) {
                                     text = it?.enumdicname
                                 }
                                 textSizeAuto = 31
@@ -924,15 +982,18 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             editText {
                                 textChangedListener {
                                     afterTextChanged {
-                                        if (it.toString().isNotEmpty()){
-                                            if (number_Edittext.text.toString().isNotEmpty()){
-                                                price_edittext_one.text = price_edittext.text.toString().toDouble().times(number_Edittext.text.toString().toDouble()).toString()
+                                        if (it.toString().isNotEmpty()) {
+                                            if (number_Edittext.text.toString().isNotEmpty()) {
+                                                price_edittext_one.text =
+                                                    price_edittext.text.toString().toDouble().times(
+                                                        number_Edittext.text.toString().toDouble()
+                                                    ).toString()
                                             }
                                         }
                                     }
                                 }
                                 price_edittext = this
-                                if (operationtype == "2"){
+                                if (operationtype == "2") {
                                     data.price.let {
                                         setText(it)
                                     }
@@ -982,7 +1043,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 textColorInt = R.color.rma_black_33
                                 textSizeAuto = 31
                                 text = "0"
-                            }.lparams(wrapContent, wrapContent){
+                            }.lparams(wrapContent, wrapContent) {
                                 marginStart = autoSize(80)
                             }
 
@@ -1050,6 +1111,14 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
                         linearLayout {
                             background = resources.getDrawable(R.color.white)
+                            onThrottleFirstClick {
+
+                                val selectDataList = viewModel.setSelectGoodsList()
+                                creatBottomSheetDialog("请选择客户", selectDataList) {
+                                    selectGoodsList.postValue(this)
+                                }
+
+                            }
                             viewModel.pricingType.bindOptional(context) {
                                 if (it?.id == "1") {
                                     visibility = View.GONE
@@ -1076,6 +1145,10 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
+                                selectGoodsList.bindOptional(context) {
+                                    text = it?.value
+                                    textColorInt = R.color.rma_black_33
+                                }
                                 text = "请选择点价合约"
                                 textSizeAuto = 31
                                 textColorInt = R.color.rma_hint_text_color_ccc
@@ -1173,7 +1246,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                midpointsPeriodTime.bindOptional(context){
+                                midpointsPeriodTime.bindOptional(context) {
                                     text = it
                                 }
                                 text = "请选择点价期"
@@ -1216,7 +1289,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                             }
 
                             textView {
-                                deliveryPeriodTime.bindOptional(context){
+                                deliveryPeriodTime.bindOptional(context) {
                                     text = it
                                 }
                                 text = "请选择交收期"
@@ -1256,7 +1329,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
                                 hintColorStr = "#CCCCCC"
                                 textSizeAuto = 31
                                 textColorStr = "#333333"
-                            }.lparams(matchParent, autoSize(132)) {
+                            }.lparams(0, autoSize(132),1f) {
                                 marginStart = autoSize(80)
                             }
 
@@ -1284,7 +1357,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
                             editText {
                                 remask_edittext = this
-                                if (operationtype == "2"){
+                                if (operationtype == "2") {
                                     setText(data.remark)
                                 }
                                 hint = "请输入备注"
@@ -1317,10 +1390,14 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
 
                     textView {
                         onThrottleFirstClick {
-                            if (checkUpdate().not()){
+                            if (checkUpdate().not()) {
                                 return@onThrottleFirstClick
                             }
-                            viewModel.orderContract(contractInfo = getContractInfo(),OperateType = "2",Remark = remask_edittext.text.toString()){
+                            viewModel.orderContract(
+                                contractInfo = getContractInfo(),
+                                OperateType = "2",
+                                Remark = remask_edittext.text.toString()
+                            ) {
                                 finish()
                             }
                         }
@@ -1339,18 +1416,18 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
         }
     }
 
-    private fun getContractInfo() : SpotContractInfo{
+    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()!!
         contractInfo.UserID = userid
-        if (contractType.value?.id == "1"){//采购合同
+        if (contractType.value?.id == "1") {//采购合同
             contractInfo.BuyUserID = userid
             contractInfo.SellUserID = selectCustomer.value?.id?.toInt()!!
-        }else{
+        } else {
             contractInfo.BuyUserID = selectCustomer.value?.id?.toInt()!!
             contractInfo.SellUserID = userid
         }
@@ -1358,7 +1435,7 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
         if (uploadFile.isNotEmpty()) {
             contractInfo.ContractAttachment = uploadFile
         }
-        if (margin_edittext.text.toString().isNotEmpty()){
+        if (margin_edittext.text.toString().isNotEmpty()) {
             contractInfo.ContractMargin = margin_edittext.text.toString().toDouble()
         }
         contractInfo.DeliveryGoodsID = selectWrStandardData.value?.deliverygoodsid?.toInt()!!
@@ -1371,26 +1448,27 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
         contractInfo.Qty = number_Edittext.text.toString().toDouble()
 
 
-        if (viewModel.pricingType.value?.id == "1"){//一口价时price为价格
+        if (viewModel.pricingType.value?.id == "1") {//一口价时price为价格
             contractInfo.Price = price_edittext.text.toString().toDouble()
-            contractInfo.Amount = price_edittext.text.toString().toDouble().times(number_Edittext.text.toString().toDouble())
-        }else if (viewModel.pricingType.value?.id == "3"){//暂定价时price为暂定价
+            contractInfo.Amount = price_edittext.text.toString().toDouble()
+                .times(number_Edittext.text.toString().toDouble())
+        } else if (viewModel.pricingType.value?.id == "3") {//暂定价时price为暂定价
             contractInfo.Price = temperary_edittext.text.toString().toDouble()
-            contractInfo.GoodsID = 1025//暂时写死一个//点价合约在点价和暂定价是需要传值
-        }else{
-            contractInfo.GoodsID = 1025//暂时写死一个
+            contractInfo.GoodsID = selectGoodsList.value?.id?.toInt() ?: 0//点价合约在点价和暂定价是需要传值
+        } else {
+            contractInfo.GoodsID = selectGoodsList.value?.id?.toInt() ?: 0//暂时写死一个
         }
-        if (midpointsPeriodTime.value?.isNotEmpty() == true){//有点价时间
+        if (midpointsPeriodTime.value?.isNotEmpty() == true) {//有点价时间
             contractInfo.StartDate = midpointsPeriodTime.value!!.split("~").get(0)
             contractInfo.EndDate = midpointsPeriodTime.value!!.split("~").get(1)
         }
 
-        if (deliveryPeriodTime.value?.isNotEmpty() == true){//有交收时间
+        if (deliveryPeriodTime.value?.isNotEmpty() == true) {//有交收时间
             contractInfo.DeliveryStartDate = deliveryPeriodTime.value!!.split("~").get(0)
             contractInfo.DeliveryEndDate = deliveryPeriodTime.value!!.split("~").get(1)
         }
 
-        if (viewModel.pricingType.value?.id != "1"){
+        if (viewModel.pricingType.value?.id != "1") {
             contractInfo.PriceMove = liter_discount_edittext.text.toString().toDouble()
         }
         //商品规格
@@ -1398,68 +1476,75 @@ class AddContractActivity : BaseActivity<ContractViewModel>() {
         return contractInfo
     }
 
-    private fun checkUpdate() : Boolean{
-        if (contractNo.text.toString().isNullOrEmpty()){
+    private fun checkUpdate(): Boolean {
+        if (contractNo.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入合同编号")
             return false
         }
 
-        if (selectCustomer.value?.id.isNullOrEmpty()){
+        if (selectCustomer.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择客户")
             return false
         }
-        if (selectWrStandardData.value?.id.isNullOrEmpty()){
+        if (selectWrStandardData.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择现货品种")
             return false
         }
 
-        if (selectProductType.value?.id.isNullOrEmpty()){
+        if (selectProductType.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择产品类型")
             return false
         }
-        if (coefficientWarehouse.text.toString().isNullOrEmpty()){
+        if (coefficientWarehouse.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入标仓系数")
             return false
         }
-        if (selectWrStandModel.value?.id.isNullOrEmpty()){
+        if (selectWrStandModel.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择型号")
             return false
         }
-        if (selectWrStandBrand.value?.id.isNullOrEmpty()){
+        if (selectWrStandBrand.value?.id.isNullOrEmpty()) {
             ToastUtils.showLong("请选择品牌")
             return false
         }
-        if (productSpecifications.text.toString().isNullOrEmpty()){
+        if (productSpecifications.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入商品规格")
             return false
         }
-        if (number_Edittext.text.toString().isNullOrEmpty()){
+        if (number_Edittext.text.toString().isNullOrEmpty()) {
             ToastUtils.showLong("请输入数量")
             return false
         }
-        if (viewModel.pricingType.value?.id == "1"){//判断一口价时需要输入的参数
-            if (price_edittext.text.toString().isNullOrEmpty()){
+        if (viewModel.pricingType.value?.id == "1") {//判断一口价时需要输入的参数
+            if (price_edittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入价格")
                 return false
             }
-            if (price_edittext_one.text.toString().isNullOrEmpty()){
+            if (price_edittext_one.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入金额")
                 return false
             }
-        }else if (viewModel.pricingType.value?.id == "2"){//判断点价时需要输入的参数
-            // TODO 添加判断点价合约
+        } else if (viewModel.pricingType.value?.id == "2") {//判断点价时需要输入的参数
+            if (selectGoodsList.value?.id.isNullOrEmpty()) {
+                ToastUtils.showLong("请选择点价合约")
+                return false
+            }
 
-            if (liter_discount_edittext.text.toString().isNullOrEmpty()){
+            if (liter_discount_edittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("升贴水")
                 return false
             }
-        }else if (viewModel.pricingType.value?.id == "3"){//判断暂定价时需要输入的参数
-            // TODO 添加判断点价合约
-            if (temperary_edittext.text.toString().isNullOrEmpty()){
+        } else if (viewModel.pricingType.value?.id == "3") {//判断暂定价时需要输入的参数
+            if (selectGoodsList.value?.id.isNullOrEmpty()) {
+                ToastUtils.showLong("请选择点价合约")
+                return false
+            }
+
+            if (temperary_edittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("请输入暂定价")
                 return false
             }
-            if (liter_discount_edittext.text.toString().isNullOrEmpty()){
+            if (liter_discount_edittext.text.toString().isNullOrEmpty()) {
                 ToastUtils.showLong("升贴水")
                 return false
             }

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

@@ -7,6 +7,8 @@ import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.global.data.UserInfoData
 import cn.muchinfo.rma.global.data.WrStandardData
 import cn.muchinfo.rma.global.data.WrStandardDetail
+import cn.muchinfo.rma.global.database.AppDatabase
+import cn.muchinfo.rma.global.room.Builder
 import cn.muchinfo.rma.netManage.base.InteractiveException
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.base.BaseViewModel
@@ -195,6 +197,19 @@ class ContractViewModel : BaseViewModel() {
         return newCustomerList
     }
 
+    /**
+     * 获取点价合约的选择列表
+     * @return ArrayList<SelectData>
+     */
+    fun setSelectGoodsList() : ArrayList<SelectData>{
+        val goodsList = Builder.getDatabase<AppDatabase>().goodsInfoDao.all
+        val newCustomerList = arrayListOf<SelectData>()
+        goodsList.forEach {
+            newCustomerList.add(SelectData(id = it.goodsid.toString(),value = it.goodsname))
+        }
+        return newCustomerList
+    }
+
 
     /**
      * 查询现货品种列表

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

@@ -120,7 +120,7 @@ class FinancialViewholder(private val activity: AppCompatActivity, private val v
                             }else{
                                 if (it?.contracttype == "1"){
                                     text = "收票"
-                                }else if (it?.contracttype == "2"){
+                                }else if (it?.contracttype == "-1"){
                                     text = "开票"
                                 }
                             }
@@ -195,6 +195,7 @@ class FinancialViewholder(private val activity: AppCompatActivity, private val v
                         val intent = Intent()
                         intent.putExtra("data",data.value)
                         intent.putExtra("type",type)
+                        intent.putExtra("statue","0")//不是详情
                         intent.setClass(context, PaymentReviewActivity::class.java)
                         ActivityUtils.startActivity(intent)
                     }
@@ -222,7 +223,8 @@ class FinancialViewholder(private val activity: AppCompatActivity, private val v
                     onThrottleFirstClick {
                         val intent = Intent()
                         intent.putExtra("data",data.value)
-                        intent.putExtra("type","3")
+                        intent.putExtra("type",type)
+                        intent.putExtra("statue","1")//是详情
                         intent.setClass(context, PaymentReviewActivity::class.java)
                         ActivityUtils.startActivity(intent)
                     }

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

@@ -34,10 +34,14 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
         intent.getParcelableExtra<FinancialManageData>("data") as FinancialManageData
     }
 
-    private val type by lazy { //type 为1是款项审核 2是发票审核 3是详情
+    private val type by lazy { //type 为1是款项审核 2是发票审核
         intent.getStringExtra("type")
     }
 
+    private val statue by lazy {
+        intent.getStringExtra("statue")//0不是详情1是详情
+    }
+
     private val dialog by lazy { createLoadingDialog(hintStr = "请求中...") }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -49,17 +53,19 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    when (type) {
-                        "1" -> {
-                            text = "款项审核"
-                        }
-                        "2" -> {
-                            text = "发票审核"
-                        }
-                        "3" -> {
-                            text = "详情"
+                    if (statue == "1"){
+                        text = "详情"
+                    }else{
+                        when (type) {
+                            "1" -> {
+                                text = "款项审核"
+                            }
+                            "2" -> {
+                                text = "发票审核"
+                            }
                         }
                     }
+
                 }
             }
 
@@ -141,7 +147,7 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                 gravity = Gravity.CENTER_VERTICAL
                                 linearLayout {
                                     textView {
-                                        text = "定价类型"
+                                        text = "点价类型"
                                         textColorInt = R.color.p_normal_summary_txt_color
                                         textSizeAuto = 29
                                     }.lparams(wrapContent, wrapContent) {
@@ -161,7 +167,7 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                 }.lparams(autoSize(450), wrapContent)
                                 linearLayout {
                                     textView {
-                                        text = "商品名称"
+                                        text = "现货品种"
                                         textColorInt = R.color.p_normal_summary_txt_color
                                         textSizeAuto = 29
                                     }.lparams(wrapContent, wrapContent) {
@@ -171,7 +177,7 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                     linearLayout {
                                         emptyView()
                                         textView {
-                                            text = data.goodsname?.isBlankString()
+                                            text = data.wrstandardname?.isBlankString()
                                             textSizeAuto = 29
                                             textColorInt = R.color.rma_black_33
                                         }.lparams(wrapContent, wrapContent) {
@@ -206,10 +212,7 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                             text = "款项类型"
                                         } else if (type == "2") {
                                             text = "类型"
-                                        }else if (type == "3") {
-                                            text = "类型"
                                         }
-
                                         textColorInt = R.color.p_normal_summary_txt_color
                                         textSizeAuto = 29
                                     }.lparams(wrapContent, wrapContent) {
@@ -221,22 +224,16 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                         textView {
                                             if (type == "1") {
                                                 if (data.kxtype == "1") {
-                                                    text = "付款申请"
+                                                    text = "付款"
                                                 } else if (data.kxtype == "2") {
-                                                    text = "退款申请"
+                                                    text = "退款"
                                                 } else if (data.kxtype == "3") {
-                                                    text = "付款/退款 申请"
+                                                    text = "付款/退款"
                                                 }
                                             } else if (type == "2") {
                                                 if (data.contracttype == "1"){
                                                     text = "收票"
-                                                }else if (data.contracttype == "2"){
-                                                    text = "开票"
-                                                }
-                                            }else if (type == "3") {
-                                                if (data.contracttype == "1"){
-                                                    text = "收票"
-                                                }else if (data.contracttype == "2"){
+                                                }else if (data.contracttype == "-1"){
                                                     text = "开票"
                                                 }
                                             }
@@ -306,8 +303,6 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                                                 }
                                             }else if (type == "2"){
                                                 text = data.InvoiceAmount?.isBlankString()
-                                            }else if (type == "3"){
-                                                text = data.InvoiceAmount?.isBlankString()
                                             }
                                             textSizeAuto = 29
                                             textColorInt = R.color.rma_black_33
@@ -386,7 +381,11 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
 
                         linearLayout {
                             background = resources.getDrawable(R.color.white)
-
+                            if (statue == "1"){
+                                visibility = View.GONE
+                            }else{
+                                visibility = View.VISIBLE
+                            }
                             textView {
                                 text = "审核意见"
                                 textSizeAuto = 31
@@ -417,6 +416,13 @@ class PaymentReviewActivity : BaseActivity<FinancialViewModel>() {
                 }
 
                 linearLayout {
+                    if (statue == "1"){
+                        if (data.applystatus == "1"){
+                            visibility = View.VISIBLE
+                        }else{
+                            visibility = View.GONE
+                        }
+                    }
                     background = resources.getDrawable(R.color.white)
                     gravity = Gravity.CENTER_VERTICAL
                     textView {

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

@@ -3,6 +3,7 @@ package cn.muchinfo.rma.view.base.home.registration
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.Gravity
+import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.CheckBox
 import android.widget.EditText
@@ -163,12 +164,7 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                     linearLayout {
                                         emptyView()
                                         textView {
-                                            text = if (data.pricetype != "3"){
-                                                "--"
-                                            }else{
-                                                data.price + "元"
-                                            }
-
+                                            text = data.loanamount + "元"
                                             textSizeAuto = 29
                                             textColorInt = R.color.rma_black_33
                                         }.lparams(wrapContent, wrapContent) {
@@ -179,6 +175,7 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                             }.lparams(matchParent, autoSize(60))
 
                             textView {
+                                visibility = View.INVISIBLE
                                 text = "贷款总额"
                                 textSizeAuto = 24
                                 textColorInt = R.color.p_normal_summary_txt_color
@@ -372,7 +369,7 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }.lparams(autoSize(450), wrapContent)
                                 linearLayout {
                                     textView {
-                                        text = "已支付款"
+                                        text = "已支付额"
                                         textColorInt = R.color.p_normal_summary_txt_color
                                         textSizeAuto = 29
                                     }.lparams(wrapContent, wrapContent) {
@@ -458,7 +455,7 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
 
                             linearLayout {
                                 textView {
-                                    text = "待支付款"
+                                    text = "待支付额"
                                     textSizeAuto = 31
                                     textColorInt = R.color.rma_black_33
                                 }.lparams(wrapContent, wrapContent){
@@ -495,7 +492,12 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
 
                                 textView {
-                                    text = "付款申请"
+                                    if (type == "1"){
+                                        text = "付款申请"
+                                    }else{
+                                        text = "收款通知"
+                                    }
+
                                     textSizeAuto = 31
                                     textColorInt = R.color.rma_black_33
                                 }.lparams(wrapContent, wrapContent) {
@@ -511,7 +513,12 @@ class PaymentRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 }
 
                                 textView {
-                                    text = "退款通知"
+                                      if (type == "1"){
+                                        text = "退款通知"
+                                    }else{
+                                        text = "退款申请"
+                                    }
+
                                     textSizeAuto = 31
                                     textColorInt = R.color.rma_black_33
                                 }.lparams(wrapContent, wrapContent) {

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

@@ -164,7 +164,7 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                 gravity = Gravity.CENTER_VERTICAL
                                 linearLayout {
                                     textView {
-                                        text = "合同类型"
+                                        text = "定价类型"
                                         textColorInt = R.color.p_normal_summary_txt_color
                                         textSizeAuto = 29
                                     }.lparams(wrapContent, wrapContent) {
@@ -557,7 +557,7 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                         gravity = Gravity.CENTER
                                         hint = "0.00"
                                         background = null
-                                        inputType = EditorInfo.TYPE_CLASS_TEXT
+                                        inputType = EditorInfo.TYPE_CLASS_NUMBER
                                         setDecimalInputType()
                                         hintColorStr = "#CCCCCC"
                                         textSizeAuto = 31
@@ -799,6 +799,7 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
                                         hint = "0.00"
                                         background = null
                                         inputType = EditorInfo.TYPE_CLASS_NUMBER
+                                        setDecimalInputType()
                                         hintColorStr = "#CCCCCC"
                                         textSizeAuto = 31
                                         textColorStr = "#333333"
@@ -913,7 +914,7 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
         if (other_price_edittext.text.toString().isNotEmpty()) {
             json.put("ReckonOtherAmount", other_price_edittext.text.toString().toDouble())
         }
-        if (margin_checkbox.text.toString().isNotEmpty()) {
+        if (margin_checkbox.isChecked) {
             if (margin_add_checkbox.isChecked) {
                 json.put("AddMargin", margin_price.text.toString().toDouble())
             } else if (margin_min_checkbox.isChecked) {
@@ -921,7 +922,12 @@ class SettlementRegistrationActivity : BaseActivity<RegistrationViewModel>() {
             }
         }
         if (amount_edittext.text.toString().isNotEmpty()) {
-            json.put("ReckonAdjustAmount", -amount_edittext.text.toString().toDouble())
+            if (amount_add_checkbox.isChecked){
+                json.put("ReckonAdjustAmount", amount_edittext.text.toString().toDouble())
+            }else if (amount_min_checkbox.isChecked){
+                json.put("ReckonAdjustAmount", -amount_edittext.text.toString().toDouble())
+            }
+
         }
         val contractInfobuilder = ErmcpMI1.ContractOperateApplyInfo.newBuilder()
 

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

@@ -3,11 +3,14 @@ package cn.muchinfo.rma.view.base.home.reportquery
 import android.view.Gravity
 import androidx.appcompat.app.AppCompatActivity
 import cn.muchinfo.rma.R
+import cn.muchinfo.rma.global.ViewEnumUtils
 import cn.muchinfo.rma.global.data.FinancialReportData
+import cn.muchinfo.rma.global.isShowTimeString
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.view.autoWidget.autoSize
 import cn.muchinfo.rma.view.autoWidget.textColorInt
 import cn.muchinfo.rma.view.autoWidget.textSizeAuto
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import mtp.polymer.com.autowidget.adapter.BaseViewHolder
 import org.jetbrains.anko.*
 
@@ -19,7 +22,11 @@ import org.jetbrains.anko.*
  * type 1 款项 2 发票
  * @constructor
  */
-class FinancialDayViewHolder(private val activity: AppCompatActivity,private val viewModel: ReportQueryViewModel,private val type : String) : BaseViewHolder<FinancialReportData>(activity){
+class FinancialDayViewHolder(
+    private val activity: AppCompatActivity,
+    private val viewModel: ReportQueryViewModel,
+    private val type: String
+) : BaseViewHolder<FinancialReportData>(activity) {
     override val itemSize: IntArray = intArrayOf(matchParent, wrapContent)
 
     override fun _FrameLayout.createContentView() {
@@ -27,12 +34,12 @@ class FinancialDayViewHolder(private val activity: AppCompatActivity,private val
             verticalLayout {
                 gravity = Gravity.START
                 textView {
-                    data.bindOptional(context){
-                        text = it?.logdatetime
+                    data.bindOptional(context) {
+                        text = it?.logdatetime?.isShowTimeString("MM/dd HH:mm")
                     }
                     textSizeAuto = 24
                     textColorInt = R.color.hint_text_color
-                }.lparams(wrapContent, wrapContent){
+                }.lparams(wrapContent, wrapContent) {
                     marginStart = autoSize(36)
                 }
             }.lparams(autoSize(225), autoSize(97))
@@ -40,14 +47,14 @@ class FinancialDayViewHolder(private val activity: AppCompatActivity,private val
             verticalLayout {
                 gravity = Gravity.CENTER_HORIZONTAL
                 textView {
-                    data.bindOptional(context){
-                        text = it?.logtypename
+                    data.bindOptional(context) {
+                        text = ViewEnumUtils.getContractType(it?.contracttype ?: "")
                     }
                     textSizeAuto = 24
                     textColorInt = R.color.hint_text_color
                 }.lparams(wrapContent, wrapContent)
                 textView {
-                    data.bindOptional(context){
+                    data.bindOptional(context) {
                         text = it?.relatedno
                     }
                     textSizeAuto = 24
@@ -58,20 +65,15 @@ class FinancialDayViewHolder(private val activity: AppCompatActivity,private val
             verticalLayout {
                 gravity = Gravity.CENTER_HORIZONTAL
                 textView {
-                    data.bindOptional(context){
-                        if (type == "1"){
-                            text = if (it?.contracttype == "1"){ "收款" }else{ "退款" }
-                        }else{
-                            text = if (it?.contracttype == "1"){ "收票" }else{ "开票" }
-                        }
-                        text = it?.relatedno
+                    data.bindOptional(context) {
+                        text = it?.optypename
                     }
                     textSizeAuto = 24
                     textColorInt = R.color.hint_text_color
                 }.lparams(wrapContent, wrapContent)
                 textView {
-                    data.bindOptional(context){
-                        text = it?.logvalue
+                    data.bindOptional(context) {
+                        text = NumberUtils.roundNum(it?.logvalue, 2)
                     }
                     textSizeAuto = 24
                     textColorInt = R.color.hint_text_color
@@ -81,12 +83,12 @@ class FinancialDayViewHolder(private val activity: AppCompatActivity,private val
             verticalLayout {
                 gravity = Gravity.END
                 textView {
-                    data.bindOptional(context){
+                    data.bindOptional(context) {
                         text = it?.applyname
                     }
                     textSizeAuto = 24
                     textColorInt = R.color.hint_text_color
-                }.lparams(wrapContent, wrapContent){
+                }.lparams(wrapContent, wrapContent) {
                     marginStart = autoSize(36)
                 }
             }.lparams(autoSize(225), autoSize(97))

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

@@ -48,6 +48,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
     private List<ItemViewHolder> mViewHolderList = new ArrayList<>();
     public int offestX = 0;
     private OnContentScrollListener onContentScrollListener;
+    private String type;
 
     public interface OnContentScrollListener {
         void onScroll(MotionEvent event);
@@ -58,9 +59,10 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
     }
 
 
-    public ContentAdapter(Context context, String listType) {
+    public ContentAdapter(Context context, String listType,String type) {
         this.context = context;
         this.listType = listType;
+        this.type = type;
     }
 
     public void setDatas(List<ContractData> datas) {
@@ -126,7 +128,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
         //发票登记
         itemViewHolder.invoice_register.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("type", "1");
+            intent.putExtra("type", this.type);
             intent.putExtra("data", datas.get(i));
             intent.setClass(context, InvoiceRegistrationActivity.class);
             ActivityUtils.startActivity(intent);
@@ -134,7 +136,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
         //点价登记
         itemViewHolder.midpoints_registration.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("type", "1");
+            intent.putExtra("type", this.type);
             intent.putExtra("data", datas.get(i));
             intent.setClass(context, MidpointsRegistrationActivity.class);
             ActivityUtils.startActivity(intent);
@@ -142,7 +144,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
         //结算登记
         itemViewHolder.settlement_of_registration.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("type", "1");
+            intent.putExtra("type", this.type);
             intent.putExtra("data", datas.get(i));
             intent.setClass(context, SettlementRegistrationActivity.class);
             ActivityUtils.startActivity(intent);
@@ -150,7 +152,7 @@ public class ContentAdapter extends RecyclerView.Adapter<ContentAdapter.ItemView
         //款项登记
         itemViewHolder.payment_registration.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("type", "1");
+            intent.putExtra("type", this.type);
             intent.putExtra("data", datas.get(i));
             intent.setClass(context, PaymentRegistrationActivity.class);
             ActivityUtils.startActivity(intent);

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

@@ -160,7 +160,7 @@ class PriceUI(private val baseFragment: Fragment, private val viewModule: Procur
     }
 
     val contentAdapter by lazy {
-        ContentAdapter(baseFragment.context,"1")
+        ContentAdapter(baseFragment.context,"1","1")
     }
 
     @SuppressLint("RtlHardcoded")
@@ -319,7 +319,7 @@ class SettlementUI(
     }
 
     val contentAdapter by lazy {
-        ContentAdapter(baseFragment.context,"2")
+        ContentAdapter(baseFragment.context,"2","1")
     }
 
     @SuppressLint("RtlHardcoded")
@@ -468,7 +468,7 @@ class newAllUI(private val baseFragment: Fragment, private val viewModule: Procu
     }
 
     val contentAdapter by lazy {
-        ContentAdapter(baseFragment.context,"3")
+        ContentAdapter(baseFragment.context,"3","1")
     }
 
     @SuppressLint("RtlHardcoded")

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

@@ -159,13 +159,13 @@ class SalePriceUI(private val baseFragment: Fragment, private val viewModule: Sa
     }
 
     val contentAdapter by lazy {
-        ContentAdapter(baseFragment.context,"1")
+        ContentAdapter(baseFragment.context,"1","2")
     }
 
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
-            viewModule.queryTitle(Constant.table_mobile_purchase_pointprice,"-1")
+            viewModule.queryTitle(Constant.table_mobile_sales_pointprice,"-1")
             contentAdapter.setOnContentScrollListener(this@SalePriceUI)
             linearLayout {
                 linearLayout {
@@ -303,13 +303,13 @@ class SaleSettlementUI(
     }
 
     val contentAdapter by lazy {//Listtype 用来判断列表的tab
-        ContentAdapter(baseFragment.context,"2")
+        ContentAdapter(baseFragment.context,"2","2")
     }
 
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
-            viewModule.queryTitle(Constant.table_mobile_purchase_settle,"-1")
+            viewModule.queryTitle(Constant.table_mobile_sales_settle,"-1")
             contentAdapter.setOnContentScrollListener(this@SaleSettlementUI)
             linearLayout {
                 linearLayout {
@@ -450,13 +450,13 @@ class SalenewAllUI(private val baseFragment: Fragment, private val viewModule: S
     }
 
     val contentAdapter by lazy {
-        ContentAdapter(baseFragment.context,"3")
+        ContentAdapter(baseFragment.context,"3","2")
     }
 
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(baseFragment.context!!).apply {
         verticalLayout {
-            viewModule.queryTitle(Constant.table_mobile_purchase_all,"-1")
+            viewModule.queryTitle(Constant.table_mobile_sales_all,"-1")
             contentAdapter.setOnContentScrollListener(this@SalenewAllUI)
             linearLayout {
                 linearLayout {

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

@@ -7,6 +7,7 @@ import cn.muchinfo.rma.global.data.ColumnsData
 import cn.muchinfo.rma.global.data.ContractData
 import cn.muchinfo.rma.view.MyApplication
 import cn.muchinfo.rma.view.autoWidget.toArrayList
+import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.base.BaseViewModel
 import cn.muchinfo.rma.view.base.app.Constant
 import mtp.polymer.com.autowidget.utils.TaskUiModel
@@ -45,7 +46,7 @@ class SaleViewModel : BaseViewModel(){
         MyApplication.getInstance()?.commonManager?.queryTableDefine(params = params) { isSuccess, respData, error ->
             if (isSuccess) {
                 when (tableKey) {
-                    Constant.table_mobile_purchase_pointprice -> {
+                    Constant.table_mobile_sales_pointprice -> {
                         val newlist = respData?.get(0)?.columns?.toArrayList()
                         newlist?.sortWith(Comparator { t1, t2 ->
                             t1.orderindex?.toInt()?.minus(t2.orderindex?.toInt() ?: 0) ?: 0
@@ -53,7 +54,7 @@ class SaleViewModel : BaseViewModel(){
                         forSomePriceTitle.postValue(newlist)
                         queryContract("2",type)
                     }
-                    Constant.table_mobile_purchase_settle -> {
+                    Constant.table_mobile_sales_settle -> {
                         val newlist = respData?.get(0)?.columns?.toArrayList()
                         newlist?.sortWith(Comparator { t1, t2 ->
                             t1.orderindex?.toInt()?.minus(t2.orderindex?.toInt() ?: 0) ?: 0
@@ -61,7 +62,7 @@ class SaleViewModel : BaseViewModel(){
                         settlementTitle.postValue(newlist)
                         queryContract("3",type)
                     }
-                    Constant.table_mobile_purchase_all -> {
+                    Constant.table_mobile_sales_all -> {
                         val newlist = respData?.get(0)?.columns?.toArrayList()
                         newlist?.sortWith(Comparator { t1, t2 ->
                             t1.orderindex?.toInt()?.minus(t2.orderindex?.toInt() ?: 0) ?: 0
@@ -140,8 +141,8 @@ class SaleViewModel : BaseViewModel(){
             newRightData.add(it.goodsname + "\n" + it.pricemove)
             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(NumberUtils.roundNum(it.payamount,2) + "\n" + NumberUtils.roundNum(it.unpayamount,2))
+            newRightData.add(NumberUtils.roundNum(it.invoiceamount,2) + "\n" + NumberUtils.roundNum(it.daikaiamount,2))
             newRightData.add(getTimeString(it))
             newRightData.add(it.convertfactor ?: "--")
             val newData = it.copy(rightData = newRightData)
@@ -162,8 +163,8 @@ class SaleViewModel : BaseViewModel(){
             newRightData.add(it.deliverygoodsname + "\n" + it.spotgoodsdesc)
             newRightData.add(it.goodsname + "\n" + it.pricemove)
             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(NumberUtils.roundNum(it.payamount,2) + "\n" + NumberUtils.roundNum(it.unpayamount,2))
+            newRightData.add(NumberUtils.roundNum(it.invoiceamount,2) + "\n" + NumberUtils.roundNum(it.daikaiamount,2))
             newRightData.add(getTimeString(it))
             newRightData.add(it.convertfactor ?: "--")
             newRightData.add(it.qty + "\n" + it.unpricedqty)
@@ -192,7 +193,7 @@ class SaleViewModel : BaseViewModel(){
             )
             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(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)