风险管理8月27日提交代码-liu.bolan-云融大宗

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

@@ -16,6 +16,8 @@ data class WrOrderDetailData(
     val deliverygoodscode : String? = "",//品种代码
     @SerializedName("deliverygoodsid")
     val deliverygoodsid : String? = "",//品种ID
+    @SerializedName("canbargain")
+    val canbargain : String? = "",//是否可议价 - 0:不可 1:可
     @SerializedName("deliverygoodsname")
     val deliverygoodsname : String? = "",//品种名称
     @SerializedName("deliverymonth")
@@ -122,6 +124,7 @@ data class WrOrderDetailData(
         parcel.readString(),
         parcel.readString(),
         parcel.readString(),
+        parcel.readString(),
         parcel.createStringArrayList()
     ) {
     }
@@ -131,6 +134,7 @@ data class WrOrderDetailData(
         parcel.writeString(cancelqty)
         parcel.writeString(deliverygoodscode)
         parcel.writeString(deliverygoodsid)
+        parcel.writeString(canbargain)
         parcel.writeString(deliverygoodsname)
         parcel.writeString(deliverymonth)
         parcel.writeString(enumdicname)

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

@@ -14,20 +14,20 @@ object Constant {
 
 
 //    const val baseurl = "http://192.168.31.93:8080/cfg?key=test_93"//李倩企业风管 18611112222
-//    const val baseurl = "http://192.168.31.182:8080/cfg?key=test_182"//李倩云融 18611112222
+//    const val baseurl = "http://192.168.31.104:8080/cfg?key=test_104"//李倩云融 18611112222
 //
 //    const val baseurl = "http://192.168.31.135:8080/cfg?key=test_135"// 瑶姐 云融 130000000001 123456
 
 //    const val baseurl = "http://192.168.31.175:8080/cfg?key=test_175" // 8888  123123
 //    const val baseurl = "http://192.168.31.223:8080/cfg?key=test_223"
-//    const val baseurl: String = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工
+    const val baseurl: String = "http://192.168.31.174:8080/cfg?key=test_174"// 邓工
 //
 //    const val baseurl = "http://192.168.31.176:8080/cfg?key=test_176" // 9999  123123  黄老板千海金
 //    const val baseurl = "http://192.168.31.171:8080/cfg?key=test_171" // 邓工 签约解约环境
 //    const val baseurl = "http://192.168.21.71:8280/cfg?key=mtp_20"
 
 //    const val baseurl = "http://192.168.31.181:8080/cfg?key=test_181"//黄老板 华南顺通 调试 110010000001/123123  120010000001/123123
-    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
+//    const val baseurl = "http://192.168.31.136:8080/cfg?key=test_136"//黄老板 华南顺通
 
 
     /**

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/bookingwarehouse/adapter/BookingAreCancelContentAdapter.java

@@ -2,6 +2,7 @@ package cn.muchinfo.rma.view.base.hnstmain.bookingwarehouse.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -15,6 +16,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.blankj.utilcode.util.ActivityUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,6 +26,7 @@ import cn.muchinfo.rma.global.data.WrOrderDetailData;
 import cn.muchinfo.rma.view.autoWidget.CustomHorizontalScrollView;
 import cn.muchinfo.rma.view.base.hnstmain.bookingwarehouse.BookingWarehouseViewModel;
 import cn.muchinfo.rma.view.base.hnstmain.spotwarehouse.SpotWareHouseViewModel;
+import cn.muchinfo.rma.view.base.hnstmain.spotwarehouse.bargain.BargainActivity;
 import cn.muchinfo.rma.view.base.procurement.RightScrollAdapter;
 
 /**
@@ -120,6 +124,21 @@ public class BookingAreCancelContentAdapter extends RecyclerView.Adapter<Booking
             itemViewHolder.invoice_register.setVisibility(View.GONE);
         }
 
+        if (data.getCanbargain().equals("1")){
+            itemViewHolder.bargain.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.bargain.setVisibility(View.GONE);
+        }
+
+        itemViewHolder.bargain.setOnClickListener(view -> {
+            Intent intent = new Intent();
+            intent.putExtra("wrtradeorderid", data.getWrtradeorderid());
+            intent.putExtra("haswr", "1");
+            intent.putExtra("type", "1");
+            intent.setClass(context, BargainActivity.class);
+            ActivityUtils.startActivity(intent);
+        });
+
         //撤单
         itemViewHolder.invoice_register.setOnClickListener(view -> {
             viewModel.getShowCancelDialog().postValue(true);
@@ -161,7 +180,8 @@ public class BookingAreCancelContentAdapter extends RecyclerView.Adapter<Booking
     }
 
     public static class ItemViewHolder extends RecyclerView.ViewHolder {
-        LinearLayout roots_view;//根部布局
+        LinearLayout roots_view;//根部布局T、
+        TextView bargain;//议价单
         TextView details;//详情
         TextView invoice_register;//撤单
         TextView midpoints_registration;
@@ -188,6 +208,7 @@ public class BookingAreCancelContentAdapter extends RecyclerView.Adapter<Booking
 
         public ItemViewHolder(@NonNull View itemView) {
             super(itemView);
+            bargain = itemView.findViewById(R.id.bargain);
             midpoints_registration = itemView.findViewById(R.id.midpoints_registration);
             settlement_of_registration = itemView.findViewById(R.id.settlement_of_registration);
             payment_registration = itemView.findViewById(R.id.payment_registration);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/bookingwarehouse/adapter/BookingTradeBarginContentAdapter.java

@@ -124,7 +124,9 @@ public class BookingTradeBarginContentAdapter extends RecyclerView.Adapter<Booki
 
         itemViewHolder.bargain.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("data",data);
+            intent.putExtra("wrtradeorderid", data.getWrtradeorderid());
+            intent.putExtra("haswr","0");
+            intent.putExtra("type","2");
             intent.setClass(context, BargainActivity.class);
             ActivityUtils.startActivity(intent);
         });

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/adapter/AreCancelContentAdapter.java

@@ -56,7 +56,7 @@ public class AreCancelContentAdapter extends RecyclerView.Adapter<AreCancelConte
     }
 
 
-    public AreCancelContentAdapter(Context context,SpotWareHouseViewModel viewModel) {
+    public AreCancelContentAdapter(Context context, SpotWareHouseViewModel viewModel) {
         this.viewModel = viewModel;
         this.context = context;
     }
@@ -115,23 +115,26 @@ public class AreCancelContentAdapter extends RecyclerView.Adapter<AreCancelConte
         itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (data.getWrtradeorderstatus().equals("3")){
-                    setPosition(i);
-                }
+                setPosition(i);
             }
         });
         itemViewHolder.details.setVisibility(View.VISIBLE);
-        if (data.getWrtradeorderstatus().equals("3") || data.getWrtradeorderstatus().equals("10")){
+        if (data.getWrtradeorderstatus().equals("3") || data.getWrtradeorderstatus().equals("10")) {
             itemViewHolder.invoice_register.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             itemViewHolder.invoice_register.setVisibility(View.GONE);
         }
-
-        itemViewHolder.bargain.setVisibility(View.VISIBLE);
+        if (data.getCanbargain().equals("1")){
+            itemViewHolder.bargain.setVisibility(View.VISIBLE);
+        }else {
+            itemViewHolder.bargain.setVisibility(View.GONE);
+        }
 
         itemViewHolder.bargain.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("data",data);
+            intent.putExtra("wrtradeorderid", data.getWrtradeorderid());
+            intent.putExtra("haswr", "1");
+            intent.putExtra("type", "1");
             intent.setClass(context, BargainActivity.class);
             ActivityUtils.startActivity(intent);
         });
@@ -139,7 +142,7 @@ public class AreCancelContentAdapter extends RecyclerView.Adapter<AreCancelConte
         //详情
         itemViewHolder.details.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("data",data);
+            intent.putExtra("data", data);
             intent.setClass(context, AreCancelledActivity.class);
             ActivityUtils.startActivity(intent);
         });

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/adapter/SpecifyDealContentAdapter.java

@@ -110,12 +110,12 @@ public class SpecifyDealContentAdapter extends RecyclerView.Adapter<SpecifyDealC
             itemViewHolder.roots_view.setBackgroundColor(context.getResources().getColor(R.color.white));
             itemViewHolder.allView.setVisibility(View.GONE);
         }
-        itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                setPosition(i);
-            }
-        });
+//        itemViewHolder.all_click_View.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                setPosition(i);
+//            }
+//        });
 
         itemViewHolder.invoice_register.setVisibility(View.VISIBLE);
         //撤单

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/adapter/TradeBarginContentAdapter.java

@@ -130,9 +130,9 @@ public class TradeBarginContentAdapter extends RecyclerView.Adapter<TradeBarginC
 
         itemViewHolder.bargain.setOnClickListener(view -> {
             Intent intent = new Intent();
-            intent.putExtra("data",data);
+            intent.putExtra("wrtradeorderid", data.getWrtradeorderid());
             intent.putExtra("haswr","1");
-            intent.putExtra("type","1");
+            intent.putExtra("type","2");
             intent.setClass(context, BargainActivity.class);
             ActivityUtils.startActivity(intent);
         });

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/spotwarehouse/bargain/BargainActivity.kt

@@ -31,8 +31,9 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
     lateinit var recyclerView: RecyclerView
 
     //传入的挂单数据
-    val data by lazy { intent.getParcelableExtra<WrTradeBargainApplyData>("data") as WrTradeBargainApplyData }
+    val wrtradeorderid by lazy { intent.getStringExtra("wrtradeorderid") }
 
+    // 1是现货 0是预售
     val haswr by lazy { intent.getStringExtra("haswr") }
 
     //1是别人对我议价单  2是我对别人的议价单
@@ -70,7 +71,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainBackReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                                viewModel.queryWrTradeBargainApply(wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showCancelBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -91,7 +92,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainNoAgreeReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0,Status = 1){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                                viewModel.queryWrTradeBargainApply(wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showSureBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -112,7 +113,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         addAction("确定") { dialog, _ ->
                             val data1 = viewModel.selectCancelBargainData.value
                             viewModel.wrBargainNoAgreeReq(WrBargainID = data1?.wrbargainid?.toLong() ?: 0,Status = 2){
-                                viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                                viewModel.queryWrTradeBargainApply(wrtradeorderid ?: "",type ?: "",haswr ?: "")
                             }
                             viewModel.showRefusedBargainDialog.postValue(false)
                             dialog.dismiss()
@@ -129,9 +130,9 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
 
             verticalLayout {
                 if (type == "1"){
-                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_me,data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_me,wrtradeorderid ?: "",type ?: "",haswr ?: "")
                 }else{
-                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_he,data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                    viewModel.specifyDealTitle(Constant.table_mobile_hnst_yscd_yjd_he,wrtradeorderid ?: "",type ?: "",haswr ?: "")
                 }
 
 //            viewModel.queryTitle(tableKey = Constant.table_mobile_report_expose, cycletime = tradedate.replace("-", ""),cycletype = "",userid = selectTransactionUser.value?.id ?: "",querytype = "1")
@@ -194,7 +195,7 @@ class BargainActivity : BaseActivity<BargainViewModel>() ,BargainContentAdapter.
                         setEnableRefresh(true)
                         setEnableLoadMore(true)
                         setOnRefreshListener {
-                            viewModel.queryWrTradeBargainApply(data.wrtradeorderid ?: "",type ?: "",haswr ?: "")
+                            viewModel.queryWrTradeBargainApply(wrtradeorderid ?: "",type ?: "",haswr ?: "")
                         }
                         setEnableScrollContentWhenLoaded(false)
                         setEnableLoadMoreWhenContentNotFull(false)

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

@@ -683,7 +683,7 @@ class TradeCircleDelistedActivity : BaseActivity<TradeCircleDelistedViewModel>()
                                 }
                             } else {//不可议价
                                 var number: Long = 0
-                                if (data.canpart == "1") {//是否允许部份摘牌 - 0:不允许 1:允许
+                                if (data.canpart == "0") {//是否允许部份摘牌 - 0:不允许 1:允许
                                     number = data.orderqty?.toLong() ?: 0
                                 } else {
                                     number = onePriceInputNumberEdittext.text.toString()

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

@@ -12,6 +12,7 @@ import android.widget.SeekBar
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.MutableLiveData
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
@@ -33,6 +34,7 @@ import com.blankj.utilcode.util.ToastUtils
 import mtp.polymer.com.autowidget.dialog.creatAccountDataSheetDialog
 import mtp.polymer.com.autowidget.dialog.showDataSelectDialog
 import org.jetbrains.anko.*
+import org.jetbrains.anko.sdk25.coroutines.textChangedListener
 
 /**
  * 买挂牌
@@ -68,7 +70,8 @@ class TradeCircleListedBuyUI(
     private val listedData: ListedData
 ) {
 
-    var marginValue = 0.0//履约保证金比例
+    val marginValue : MutableLiveData<Double> = MutableLiveData()//履约保证金比例
+
 
     //选择的资金账号
     val selectAccountData: MutableLiveData<AccountData> = MutableLiveData()
@@ -120,15 +123,6 @@ class TradeCircleListedBuyUI(
     //初始化设置履约保证金比例
     fun setMarginValue() {
         selectAccountData.postValue(GlobalDataCollection.instance?.accountData)
-        if (modelType == "1") {//有仓单的卖履约保证金
-            marginValue =
-                GlobalDataCollection.instance?.marketTradeConfigData?.sellmarginvalue?.toDouble()
-                    ?: 0.0
-        } else {//无仓单的卖履约保证金比例
-            marginValue =
-                GlobalDataCollection.instance?.marketTradeConfigData?.sellmarginvalue2?.toDouble()
-                    ?: 0.0
-        }
     }
 
     @SuppressLint("NewApi", "SetTextI18n")
@@ -205,9 +199,9 @@ class TradeCircleListedBuyUI(
                                     delistingAmount,
                                     2
                                 ) + "(需履约保证金" + NumberUtils.roundNum(
-                                    delistingAmount?.times(
-                                        marginValue
-                                    ) ?: 0.0, 2
+                                    delistingAmount.times(
+                                        marginValue.value ?: 0.0
+                                    ), 2
                                 ) + ")"
                         }
                     }
@@ -275,9 +269,9 @@ class TradeCircleListedBuyUI(
                                             delistingAmount,
                                             2
                                         ) + "(需履约保证金" + NumberUtils.roundNum(
-                                            delistingAmount?.times(
-                                                marginValue
-                                            ) ?: 0.0, 2
+                                            delistingAmount.times(
+                                                marginValue.value ?: 0.0
+                                            ), 2
                                         ) + ")"
                                 }
                             }
@@ -460,6 +454,13 @@ class TradeCircleListedBuyUI(
                     linearLayout {
                         gravity = Gravity.CENTER_VERTICAL
                         editText {
+                            textChangedListener {
+                                afterTextChanged {
+                                    if (it.toString().isNotEmpty()) {
+                                        marginValue.postValue(it?.toString()?.toDouble()?.div(100.0))
+                                    }
+                                }
+                            }
                             performance_bond = this
                             hint = "请输入履约保证金"
                             background = null
@@ -634,6 +635,23 @@ class TradeCircleListedBuyUI(
                 }
 
                 textView {
+                    marginValue.bindOptional(context){
+                        if (onePriceInputEdittext.text.toString().isNullOrEmpty().not() && listednumberEdittext.text.toString().isNullOrEmpty().not()) {
+                            val delistingAmount = onePriceInputEdittext.text.toString().toDouble().times(
+                                listednumberEdittext.text.toString()
+                                    .toDouble()
+                            )
+                            one_delisting_amount.text =
+                                NumberUtils.roundNum(
+                                    delistingAmount,
+                                    2
+                                ) + "(需履约保证金" + NumberUtils.roundNum(
+                                    delistingAmount.times(
+                                        it ?: 0.0
+                                    ), 2
+                                ) + ")"
+                        }
+                    }
                     text = "0"
                     one_delisting_amount = this
                     textSizeAuto = 34
@@ -685,12 +703,13 @@ class TradeCircleListedBuyUI(
             ToastUtils.showLong("挂牌数量不能为0")
             return false
         }
-        if (startInputNumber.text.toString().isNullOrEmpty()) {
-            ToastUtils.showLong("请输入起摘数量")
-            return false
-        }
 
         if (whole_list.isChecked.not()) {
+            if (startInputNumber.text.toString().isNullOrEmpty()) {
+                ToastUtils.showLong("请输入起摘数量")
+                return false
+            }
+
             if (hasType == "1") {
                 if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
                     ToastUtils.showLong("起摘数量不能小于" + data.minivalue)

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

@@ -31,6 +31,7 @@ import mtp.polymer.com.autowidget.dialog.creatAccountDataSheetDialog
 import mtp.polymer.com.autowidget.dialog.creatHnstSpotDetailSheetDialog
 import mtp.polymer.com.autowidget.dialog.showDataSelectDialog
 import org.jetbrains.anko.*
+import org.jetbrains.anko.sdk25.coroutines.textChangedListener
 
 /**
  * 卖挂牌
@@ -69,7 +70,7 @@ class TradeCircleListedSellUI(
     //选择的现货仓单明细数据
     val selectSpotDetailsData: MutableLiveData<HoldLBData> = MutableLiveData()
 
-    var marginValue = 0.0//履约保证金比例
+    val marginValue : MutableLiveData<Double> = MutableLiveData()//履约保证金比例
 
     //选择的资金账号
     val selectAccountData: MutableLiveData<AccountData> = MutableLiveData()
@@ -135,15 +136,7 @@ class TradeCircleListedSellUI(
         }else{
             viewModel.querydetailsWarehouseWrPosition(deliverygoodsid = listedData.DeliveryGoodsID ?: "",wrstandardid = listedData.WrFtWrstandard?.wrstandardid ?: "")
         }
-        if (modelType == "1") {//有仓单的卖履约保证金
-            marginValue =
-                GlobalDataCollection.instance?.marketTradeConfigData?.sellmarginvalue?.toDouble()
-                    ?: 0.0
-        } else {//无仓单的卖履约保证金比例
-            marginValue =
-                GlobalDataCollection.instance?.marketTradeConfigData?.sellmarginvalue2?.toDouble()
-                    ?: 0.0
-        }
+
     }
 
     @SuppressLint("NewApi", "SetTextI18n")
@@ -220,9 +213,9 @@ class TradeCircleListedSellUI(
                                     delistingAmount,
                                     2
                                 ) + "(需履约保证金" + NumberUtils.roundNum(
-                                    delistingAmount?.times(
-                                        marginValue
-                                    ) ?: 0.0, 2
+                                    delistingAmount.times(
+                                        marginValue.value ?: 0.0
+                                    ), 2
                                 ) + ")"
                         }
 
@@ -337,9 +330,9 @@ class TradeCircleListedSellUI(
                                             delistingAmount,
                                             2
                                         ) + "(需履约保证金" + NumberUtils.roundNum(
-                                            delistingAmount?.times(
-                                                marginValue
-                                            ) ?: 0.0, 2
+                                            delistingAmount.times(
+                                                marginValue.value ?: 0.0
+                                            ), 2
                                         ) + ")"
                                 }
                             }
@@ -530,6 +523,13 @@ class TradeCircleListedSellUI(
                         editText {
                             performance_bond = this
                             hint = "请输入履约保证金"
+                            textChangedListener {
+                                afterTextChanged {
+                                    if (it.toString().isNotEmpty()) {
+                                        marginValue.postValue(it?.toString()?.toDouble()?.div(100.0))
+                                    }
+                                }
+                            }
                             background = null
                             inputType = EditorInfo.TYPE_CLASS_NUMBER
                             setDecimalInputType()
@@ -703,6 +703,23 @@ class TradeCircleListedSellUI(
 
                 textView {
                     text = "0"
+                    marginValue.bindOptional(context){
+                        if (onePriceInputEdittext.text.toString().isNullOrEmpty().not() && listednumberEdittext.text.toString().isNullOrEmpty().not()) {
+                            val delistingAmount = onePriceInputEdittext.text.toString().toDouble().times(
+                                listednumberEdittext.text.toString()
+                                    .toDouble()
+                            )
+                            one_delisting_amount.text =
+                                NumberUtils.roundNum(
+                                    delistingAmount,
+                                    2
+                                ) + "(需履约保证金" + NumberUtils.roundNum(
+                                    delistingAmount.times(
+                                        it ?: 0.0
+                                    ), 2
+                                ) + ")"
+                        }
+                    }
                     one_delisting_amount = this
                     textSizeAuto = 34
                     textColorInt = R.color.rma_black_33
@@ -764,12 +781,12 @@ class TradeCircleListedSellUI(
             ToastUtils.showLong("挂牌数量不能为0")
             return false
         }
-        if (startInputNumber.text.toString().isNullOrEmpty()) {
-            ToastUtils.showLong("请输入起摘数量")
-            return false
-        }
 
         if (whole_list.isChecked.not()){
+            if (startInputNumber.text.toString().isNullOrEmpty()) {
+                ToastUtils.showLong("请输入起摘数量")
+                return false
+            }
             if (hasType == "1"){
                 if (startInputNumber.text.toString().toLong() < data.minivalue?.toLong() ?: 0) {
                     ToastUtils.showLong("起摘数量不能小于" + data.minivalue)

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

@@ -299,8 +299,8 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                     var minStartNum : Long = 0
                                     if (sellUI.whole_list.isChecked){
                                         canPart = 0
-                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                     }else{
+                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                         canPart = 1
                                     }
                                     var allFriendsFlag = 0
@@ -411,8 +411,8 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                     var minStartNum : Long = 0
                                     if (sellUI.whole_list.isChecked){
                                         canPart = 0
-                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                     }else{
+                                        minStartNum = sellUI.startInputNumber.text.toString().toLong()
                                         canPart = 1
                                     }
                                     var allFriendsFlag = 0
@@ -523,9 +523,9 @@ class TradeCircleListedingActivity : BaseActivity<TradeCircleListedingViewModel>
                                 var minStartNum : Long = 0
                                 if (buyUI.whole_list.isChecked) {
                                     canPart = 0
-                                    minStartNum = buyUI.startInputNumber.text.toString().toLong()
                                 } else {
                                     canPart = 1
+                                    minStartNum = buyUI.startInputNumber.text.toString().toLong()
                                 }
                                 var allFriendsFlag = 0
                                 if (buyUI.no_friend.isChecked) {