风险管理11月26日提交代码-liu.bolan-天津麦顿bug

RMA/app/build.gradle

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

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

@@ -11,7 +11,6 @@ import androidx.fragment.app.Fragment
 import cn.muchinfo.rma.R
 import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.lifecycle.bindOptional
-import cn.muchinfo.rma.view.autoWidget.StatusLayout
 import cn.muchinfo.rma.view.autoWidget.easyNavigationBar
 import cn.muchinfo.rma.view.base.BaseActivity
 import cn.muchinfo.rma.view.base.app.Constant
@@ -49,6 +48,7 @@ import org.greenrobot.eventbus.ThreadMode
 import org.jetbrains.anko.verticalLayout
 
 
+@Suppress("DEPRECATION")
 class MainActivity : BaseActivity<MainViewModel>() {
 
     /** 首页 **/
@@ -129,17 +129,6 @@ class MainActivity : BaseActivity<MainViewModel>() {
     /** 华南顺通 我的 **/
     var hnstMainFragment: HnstMainFragment? = null
 
-    /** 状态控制页 **/
-    private lateinit var statusLayout: StatusLayout
-
-    private val fragments by lazy {
-        listOf(
-            homeFragment,
-            procurementFragment,
-            saleFragment, futureFragment, exposureFragment
-        )
-    }
-
     private val newFragments: ArrayList<Fragment> = arrayListOf()
 
     private val newTabText: ArrayList<String> = arrayListOf()
@@ -165,12 +154,16 @@ class MainActivity : BaseActivity<MainViewModel>() {
 
     fun initFragmentData() {
 
-        if (SPUtils.getInstance().getString(Constant.oem) == "yrdz"){
-            newFragments.add(yrdzHomeFragment)
-        }else if (SPUtils.getInstance().getString(Constant.oem) == "tjmd"){
-            newFragments.add(tjmdHomeFragment)
-        } else{
-            newFragments.add(homeFragment)
+        when {
+            SPUtils.getInstance().getString(Constant.oem) == "yrdz" -> {
+                newFragments.add(yrdzHomeFragment)
+            }
+            SPUtils.getInstance().getString(Constant.oem) == "tjmd" -> {
+                newFragments.add(tjmdHomeFragment)
+            }
+            else -> {
+                newFragments.add(homeFragment)
+            }
         }
         newTabText.add("首页")
         newNormalIcon.add(R.mipmap.main_tab_1)
@@ -438,6 +431,4 @@ class MainActivity : BaseActivity<MainViewModel>() {
             viewModel.getTaAccounts()
         }
     }
-
-
 }

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

@@ -6,7 +6,7 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-//    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
+    const val baseurl = "http://103.40.249.123:38280/cfg?key=mtp_20" // 天津麦顿
 //    const val baseurl = "http://103.40.249.123:28280/cfg?key=mtp_20"//云融大宗
 //    const val baseurl = "http://103.40.249.123:8280/cfg?key=mtp_20"//千海金外盘
 //    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
@@ -18,7 +18,7 @@ object Constant {
 //    const val baseurl = "http://192.168.31.203:8080/cfg?key=test_203"//李倩云融 18611112222
 //
 //    const val baseurl = "http://192.168.31.204:8080/cfg?key=test_204"// 瑶姐 云融 190000000001 123456
-    const val baseurl = "http://192.168.31.202:8080/cfg?key=test_202"// 瑶姐 云融 190000000001 123456
+//    const val baseurl = "http://192.168.31.202:8080/cfg?key=test_202"// 瑶姐 云融 190000000001 123456
 //    const val baseurl = "http://192.168.31.205:8080/cfg?key=test_205"// 瑶姐 云融 190000000001 123456
 //    const val baseurl = "http://192.168.31.201:8080/cfg?key=test_201"// 邓工 千海金
 

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

@@ -698,6 +698,17 @@ class HnstMainFragment : BaseFragment<HnstMainViewmodel>() {
                                                 NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
                                                 2
                                             )
+                                            when {
+                                                it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0.0 -> {
+                                                    textColorInt = R.color.rma_red_color
+                                                }
+                                                it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0.0 -> {
+                                                    textColorInt = R.color.rma_green_color
+                                                }
+                                                else -> {
+                                                    textColorInt = R.color.rma_black_33
+                                                }
+                                            }
                                         } else {
                                             text = "****"
                                         }

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/account/RydzAccountActivity.kt

@@ -510,14 +510,22 @@ class MoneyInfoUI(
                 }
 
                 textView {
+
                     /**
-                     * 占用-usedmargin
+                     * 浮动盈亏-usedmargin
                      */
                     viewModel.usedAccountData.bindOptional(context) {
                         text = NumberUtils.roundNum(
                             NumberUtils.doubleDistortion(it?.valueOfposition_keep_watch_profit_and_loss?.toString()),
                             2
                         )
+                        textColorInt = if (it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 > 0.0){
+                            R.color.rma_red_color
+                        }else if (it?.valueOfposition_keep_watch_profit_and_loss ?: 0.0 < 0.0){
+                            R.color.rma_green_color
+                        }else{
+                            R.color.rma_black_33
+                        }
                     }
                     textSizeAuto = 36
                     textColorInt = R.color.rma_black_33

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/ContractOrdersActivity.kt

@@ -133,10 +133,8 @@ class ContractOrdersActivity : BaseActivity<ContractOrdersViewModel>() {
         if (selectedTabIndex == 0) {
             positionUI.refresh(quoteMessageEvent = quoteMessageEvent)
         }
-
     }
 
-
     override fun onResume() {
         super.onResume()
         viewModel.queryContractTradePosition(type = type ?: "1")
@@ -151,7 +149,6 @@ class ContractOrdersActivity : BaseActivity<ContractOrdersViewModel>() {
         EventBus.getDefault().unregister(this)
     }
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         EventBus.getDefault().register(this)
@@ -161,7 +158,7 @@ class ContractOrdersActivity : BaseActivity<ContractOrdersViewModel>() {
             topBar {
                 commonLeftButton()
                 commonTitle {
-                    text = "商品订单"
+                    text = "掉期订单"
                 }
             }
 

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/adapter/ContractPositionContentAdapter.java

@@ -40,6 +40,8 @@ import cn.muchinfo.rma.view.base.hnstmain.contractorders.unwind.AgreementUnwindA
 import cn.muchinfo.rma.view.base.hnstmain.contractorders.unwind.ContractUnWindActivity;
 import cn.muchinfo.rma.view.base.hnstmain.finance.FinanceManagementDetailsActivity;
 import cn.muchinfo.rma.view.base.hnstmain.finance.FinanceManagementViewModel;
+import cn.muchinfo.rma.view.base.platinumtreasure.adapter.QHjRightData;
+import cn.muchinfo.rma.view.base.platinumtreasure.adapter.QhjRightScrollAdapter;
 import cn.muchinfo.rma.view.base.procurement.RightScrollAdapter;
 
 /**
@@ -117,8 +119,9 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
         itemViewHolder.rvItemRight.setLayoutManager(linearLayoutManager);
         itemViewHolder.rvItemRight.setHasFixedSize(true);
-        RightScrollAdapter rightScrollAdapter = new RightScrollAdapter(context);
 
+        TjmdRightScrollAdapter tjmdRightScrollAdapter = new TjmdRightScrollAdapter(context);
+        List<QHjRightData> rightData = new ArrayList<>();
 
         //获取盘面信息
         QuoteDayData quoteDayData = null;
@@ -138,46 +141,77 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
                     quoteDayData = quotesList.get(j).getQuoteDayData();//赋值当前商品的盘面信息
                 }
             }
-
         }
-        List<String> rightData = new ArrayList<>();
+
+        //方向
+        QHjRightData directionData = new QHjRightData();
         //方向
         if (data.getBuyorsell().equals("0")) {
-            rightData.add("买入");
+            directionData.setValue("买入");
         } else {
-            rightData.add("卖出");
+            directionData.setValue("卖出");
         }
+        directionData.setColorType("1");
+
         //持有数量
-        rightData.add(data.getCurpositionqty());
+        QHjRightData curpositionqtyData = new QHjRightData();
+        curpositionqtyData.setValue(data.getCurpositionqty());
+        curpositionqtyData.setColorType("1");
+
         //可用数量
-        rightData.add(data.getEnableqty());
+        QHjRightData enableqtyData = new QHjRightData();
+        enableqtyData.setValue(data.getEnableqty());
+        enableqtyData.setColorType("1");
+
         //冻结数量
-        rightData.add(data.getFrozenqty());
-        //持仓均价
+        QHjRightData frozenqtyData = new QHjRightData();
+        frozenqtyData.setValue(data.getFrozenqty());
+        frozenqtyData.setColorType("1");
+
+        //持仓均价 TODO 颜色
+        QHjRightData averagepriceData = new QHjRightData();
         if (data.getAverageprice().equals("0")) {
-            rightData.add("--");
+            averagepriceData.setValue("--");
         } else {
-            rightData.add(NumberUtils.roundNum(data.getAverageprice(), goodsInfo.getDecimalplace()));
+            averagepriceData.setValue(NumberUtils.roundNum(data.getAverageprice(), goodsInfo.getDecimalplace()));
         }
+
         if (quoteDayData != null) {
-            //现价
+
+            //判断持仓均价的颜色
+            Double averagepricegap = Double.valueOf(data.getAverageprice()) - quoteDayData.getPresettle();
+            if (averagepricegap > 0){
+                averagepriceData.setColorType("3");
+            }else if (averagepricegap < 0){
+                averagepriceData.setColorType("2");
+            }else {
+                averagepriceData.setColorType("1");
+            }
+
+            //现价 TODO 颜色
+            QHjRightData nowPriceData = new QHjRightData();
             if (quoteDayData.getPrice() == 0.0) {
-                rightData.add("--");
+                nowPriceData.setValue("--");
             } else {
-                rightData.add(NumberUtils.roundNum(String.valueOf(quoteDayData.getPrice()), 2));
+                nowPriceData.setValue(NumberUtils.roundNum(String.valueOf(quoteDayData.getPrice()), 2));
             }
             //持仓金额
-            rightData.add(NumberUtils.roundNum(data.getCurholderamount(), 2));
+            QHjRightData curholderamountData = new QHjRightData();
+            curholderamountData.setValue(NumberUtils.roundNum(data.getCurholderamount(), 2));
+            curholderamountData.setColorType("1");
             //市值
+            QHjRightData marketValueData = new QHjRightData();
+
             if (data.getTradeproperty().equals("2")) {
                 if (quoteDayData.getPrice() == 0.0) {
-                    rightData.add("--");
+                    marketValueData.setValue("--");
                 } else {
-                    rightData.add(NumberUtils.roundNum(Double.valueOf(data.getCurpositionqty()) * Double.valueOf(data.getAgreeunit()) * quoteDayData.getPrice(), 2));
+                    marketValueData.setValue(NumberUtils.roundNum(Double.valueOf(data.getCurpositionqty()) * Double.valueOf(data.getAgreeunit()) * quoteDayData.getPrice(), 2));
                 }
             }else {
-                rightData.add("--");
+                marketValueData.setValue("--");
             }
+            marketValueData.setColorType("1");
 
             //占用保证金 刚加上不到半个月的字段就要去掉了（2021年11月4号）
 //            rightData.add(NumberUtils.roundNum(data.getUsedmargin(), 2));
@@ -200,19 +234,33 @@ public class ContractPositionContentAdapter extends RecyclerView.Adapter<Contrac
                 }
             }
             //浮动盈亏
-            rightData.add(Profit);
-        } else {
-            //现价
-            rightData.add("0");
-            //持仓金额
-            rightData.add("0");
-            //浮动盈亏
-            rightData.add("0");
+            QHjRightData profitData = new QHjRightData();
+            profitData.setValue(Profit);
+
+            String textUpDown = NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf((quoteDayData.getPrice() - quoteDayData.getPresettle()))), 2);//涨跌
+            if (Double.valueOf(textUpDown) > 0) {
+                nowPriceData.setColorType("3");
+                profitData.setColorType("3");
+            } else if (Double.valueOf(textUpDown) < 0) {
+                nowPriceData.setColorType("2");
+                profitData.setColorType("2");
+            } else {
+                nowPriceData.setColorType("1");
+                profitData.setColorType("1");
+            }
+            rightData.add(directionData);
+            rightData.add(curpositionqtyData);
+            rightData.add(enableqtyData);
+            rightData.add(frozenqtyData);
+            rightData.add(averagepriceData);
+            rightData.add(nowPriceData);
+            rightData.add(curholderamountData);
+            rightData.add(marketValueData);
+            rightData.add(profitData);
         }
 
-
-        rightScrollAdapter.setDatas(rightData);
-        itemViewHolder.rvItemRight.setAdapter(rightScrollAdapter);
+        tjmdRightScrollAdapter.setDatas(rightData);
+        itemViewHolder.rvItemRight.setAdapter(tjmdRightScrollAdapter);
         //缓存当前holder
         if (!mViewHolderList.contains(itemViewHolder)) {
             mViewHolderList.add(itemViewHolder);

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/contractorders/adapter/TjmdRightScrollAdapter.java

@@ -0,0 +1,74 @@
+package cn.muchinfo.rma.view.base.hnstmain.contractorders.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+import cn.muchinfo.rma.R;
+import cn.muchinfo.rma.view.base.platinumtreasure.adapter.QHjRightData;
+
+public class TjmdRightScrollAdapter extends RecyclerView.Adapter<TjmdRightScrollAdapter.ScrollViewHolder> {
+
+
+    private Context context;
+    private List<QHjRightData> rightDatas;
+
+    public TjmdRightScrollAdapter(Context context) {
+        this.context = context;
+    }
+
+    public void setDatas(List<QHjRightData> rightDatas) {
+        this.rightDatas = rightDatas;
+        notifyDataSetChanged();
+    }
+
+
+    @NonNull
+    @Override
+    public ScrollViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+        View view = LayoutInflater.from(context).inflate(R.layout.layout_tjmd_item_scroll, viewGroup, false);
+        return new ScrollViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ScrollViewHolder scrollViewHolder, int i) {
+        QHjRightData data = rightDatas.get(i);
+        if (data.getColorType().equals("1")){//黑色
+//            scrollViewHolder.mTvScrollItem.setBackgroundColor(null);
+            scrollViewHolder.mTvScrollItem.setTextColor(context.getResources().getColor(R.color.rma_black_33));
+        }else  if (data.getColorType().equals("2")){//绿色
+//            scrollViewHolder.mTvScrollItem.setBackground(context.getResources().getDrawable(R.drawable.qhj_green_bg));
+            scrollViewHolder.mTvScrollItem.setTextColor(context.getResources().getColor(R.color.rma_green_color));
+        }else {//红色
+//            scrollViewHolder.mTvScrollItem.setBackground(context.getResources().getDrawable(R.drawable.qhj_red_bg));
+            scrollViewHolder.mTvScrollItem.setTextColor(context.getResources().getColor(R.color.rma_red_color));
+        }
+        scrollViewHolder.mTvScrollItem.setText(data.getValue());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return null == rightDatas ? 0 : rightDatas.size();
+    }
+
+    class ScrollViewHolder extends RecyclerView.ViewHolder {
+        LinearLayout item_click;
+        TextView mTvScrollItem;
+
+        public ScrollViewHolder(@NonNull View itemView) {
+            super(itemView);
+            item_click = itemView.findViewById(R.id.item_click);
+            mTvScrollItem = itemView.findViewById(R.id.tv_right_scroll);
+
+        }
+    }
+}

RMA/app/src/main/java/cn/muchinfo/rma/view/base/hnstmain/performance/PerformationPayActivity.kt

@@ -17,6 +17,7 @@ import org.jetbrains.anko.*
 /**
  * 履约信息-付款页面
  */
+@Suppress("DEPRECATION")
 class PerformationPayActivity : BaseActivity<PerformanceInformationViewModel>(){
 
     val data by lazy { intent.getParcelableExtra<PerformancePlanData>("data") as PerformancePlanData }
@@ -69,7 +70,7 @@ class PerformationPayActivity : BaseActivity<PerformanceInformationViewModel>(){
                 }
 
                 textView {
-                    text = data.wrstandardname
+                    text = data.wrtypename
                     textSizeAuto = 29
                     textColorInt = R.color.rma_black_33
                 }.lparams(wrapContent, wrapContent)
@@ -196,7 +197,6 @@ class PerformationPayActivity : BaseActivity<PerformanceInformationViewModel>(){
                 }.lparams(wrapContent, wrapContent)
             }.lparams(matchParent, autoSize(132))
 
-
             verticalEmptyView()
 
             linearLayout {
@@ -212,10 +212,10 @@ class PerformationPayActivity : BaseActivity<PerformanceInformationViewModel>(){
                         }
                     }
                     gravity = Gravity.CENTER
-                    backgroundResource = R.mipmap.rma_save_info_bg
+                    backgroundResource = R.mipmap.rma_submit_bg
                     text = "付款"
                     textSizeAuto = 38
-                    textColorInt = R.color.rma_star_color
+                    textColorInt = R.color.white
                 }.lparams(matchParent, autoSize(119)) {
                     marginStart = autoSize(36)
                     marginEnd = autoSize(36)

RMA/app/src/main/java/cn/muchinfo/rma/view/base/home/reference/ReferenceAdapter.java

@@ -192,7 +192,7 @@ public class ReferenceAdapter extends RecyclerView.Adapter<ReferenceAdapter.Item
             }else {
                 highRightData.setColorType("1");
             }
-            highRightData.setColorType("1");
+
             //最低价
             QHjRightData lowestRightData = new QHjRightData();
             if (quoteDayData.getLowest() == 0.0){
@@ -201,24 +201,27 @@ public class ReferenceAdapter extends RecyclerView.Adapter<ReferenceAdapter.Item
                 lowestRightData.setValue(NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf(quoteDayData.getLowest())),data.getDecimalplace()));
             }
 
+            //昨收价
+            QHjRightData yesCloseRightData = new QHjRightData();
+            if (quoteDayData.getPreclose() == 0.0){
+                yesCloseRightData.setValue("--");
+            }else {
+                yesCloseRightData.setValue(NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf(quoteDayData.getPreclose())),data.getDecimalplace()));
+            }
             double lowestRightDatColor = quoteDayData.getLowest() - quoteDayData.getPreclose();
+            yesCloseRightData.setColorType("1");
+
             if (lowestRightDatColor > 0){
                 lowestRightData.setColorType("3");
+
             }else if (lowestRightDatColor < 0){
                 lowestRightData.setColorType("2");
+
             }else {
                 lowestRightData.setColorType("1");
-            }
-            lowestRightData.setColorType("1");
-            //昨收价
-            QHjRightData yesCloseRightData = new QHjRightData();
-            if (quoteDayData.getPreclose() == 0.0){
-                yesCloseRightData.setValue("--");
-            }else {
-                yesCloseRightData.setValue(NumberUtils.roundNum(NumberUtils.doubleDistortion(String.valueOf(quoteDayData.getPreclose())),data.getDecimalplace()));
+
             }
 
-            yesCloseRightData.setColorType("1");
             //行情时间
             QHjRightData timeRightData = new QHjRightData();
             if (quoteDayData.getLasttime().isEmpty()){

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

@@ -28,7 +28,7 @@ class ReferenceFragment : BaseFragment<ReferenceViewModel>() , ReferenceAdapter.
         arguments?.getString("titlename")
     }
 
-     private lateinit var swipeToLayout: SwipeToLoadLayout
+    private lateinit var swipeToLayout: SwipeToLoadLayout
     private lateinit var statusLayout: StatusLayout
     lateinit var horScrollview: CustomHorizontalScrollView
     lateinit var recyclerView: RecyclerView

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

@@ -261,9 +261,9 @@ class TjmdMarketFragment : BaseFragment<TjmdMarketViewModel>(){
                         val data = selectTjmdMarketSectionConfigData.value
                         if (data?.trademode == "17"){//仓单贸易和仓单预售
                             if (data.auctionwrtype == "2"){//有仓单=仓单贸易
-                                if (data.listingmode == "1"){//一手价
+                                if (data.listingmode == "1"){//一手价挂牌页面
                                     getAppCompatActivity().TjmdWarehouseOneListedDialog(fragment = this@TjmdMarketFragment,activity = getAppCompatActivity(),viewModel = viewModel,type = "1",data = it ?: ListedData()).show()
-                                }else if (data.listingmode == "2"){//浮动价
+                                }else if (data.listingmode == "2"){//浮动价挂牌页面
                                     getAppCompatActivity().TjmdWarehouseFloatListedDialog(activity = getAppCompatActivity(),viewModel = viewModel,type = "1",data = it ?: ListedData()).show()
                                 }else if (data.listingmode == "3"){//贸易圈
                                     val intent = Intent()
@@ -275,9 +275,9 @@ class TjmdMarketFragment : BaseFragment<TjmdMarketViewModel>(){
                                     ActivityUtils.startActivity(intent)
                                 }
                             }else if (data.auctionwrtype == "1"){//无仓单=仓单预售
-                                if (data.listingmode == "1"){//一手价
+                                if (data.listingmode == "1"){//一手价挂牌页面
                                     getAppCompatActivity().TjmdHnstOneListedDialog(activity = getAppCompatActivity(),viewModel = viewModel,type = "2",data = it ?: ListedData()).show()
-                                }else if (data.listingmode == "2"){//浮动价
+                                }else if (data.listingmode == "2"){//浮动价挂牌页面
                                     getAppCompatActivity().TjmdHnstFloatListedDialog(activity = getAppCompatActivity(),viewModel = viewModel,type = "2",data = it ?: ListedData()).show()
                                 }else if (data.listingmode == "3"){//贸易圈
                                     val intent = Intent()

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

@@ -603,7 +603,7 @@ class TjmdMarketViewModel : BaseViewModel(){
                 if (respData.isNullOrEmpty().not()){
                     orderQuoteDataByListed.postValue(respData?.get(0))
                 }else{
-                    noWRFactorTypeIdDataForListed.postValue(ListedData(DeliveryGoodsID = getDeliveryGoodsIDByWRStandardID(wrstandardid),WrFtWrstandard = getWrFtWrstandardByWRStandardID(wrstandardid),FactoryItemsList = WrStandardFactoryItemDataList.value ?: arrayListOf()))
+                    noWRFactorTypeIdDataForListed.postValue(ListedData(DeliveryGoodsID = getDeliveryGoodsIDByWRStandardID(wrstandardid),DeliveryGoodsName = getDeliveryGoodsNameByWRStandardID(wrstandardid),WrFtWrstandard = getWrFtWrstandardByWRStandardID(wrstandardid),FactoryItemsList = WrStandardFactoryItemDataList.value ?: arrayListOf()))
                 }
             }
         }

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

@@ -195,6 +195,14 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
         }
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == 1004 && resultCode == 1005){
+            val permancePlanTmpData = data?.getParcelableExtra<PermancePlanTmpData>("data") as PermancePlanTmpData
+            viewModel.selectPerformanceStepData.postValue(permancePlanTmpData)
+        }
+    }
+
     @SuppressLint("SetTextI18n")
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {

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

@@ -22,6 +22,9 @@ class BusinessHallViewModel : BaseViewModel(){
      */
     val loadingDialogStatus: MutableLiveData<TaskUiModel> = MutableLiveData()
 
+    //选择的履约模版数据
+    val selectPerformanceStepData : MutableLiveData<PermancePlanTmpData> = MutableLiveData()
+
     //顶部数据是否展开
     val priceUpDown: MutableLiveData<Boolean> = MutableLiveData<Boolean>().apply { value = false }
 

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

@@ -1,6 +1,7 @@
 package cn.muchinfo.rma.view.base.warehousereceipt
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.view.Gravity
@@ -21,6 +22,7 @@ import cn.muchinfo.rma.global.GlobalDataCollection
 import cn.muchinfo.rma.global.data.AccountData
 import cn.muchinfo.rma.global.data.HoldLBData
 import cn.muchinfo.rma.global.data.OrderQuoteData
+import cn.muchinfo.rma.global.data.PermancePlanTmpData
 import cn.muchinfo.rma.global.utils.TimeUtils
 import cn.muchinfo.rma.lifecycle.bindOptional
 import cn.muchinfo.rma.protobuf.protoclasses.WarehouseTradeMI1
@@ -28,6 +30,7 @@ import cn.muchinfo.rma.view.autoWidget.*
 import cn.muchinfo.rma.view.autoWidget.utils.NumberUtils
 import cn.muchinfo.rma.view.autoWidget.view.MangeNumberEditText2
 import cn.muchinfo.rma.view.base.future.trade.itemView
+import cn.muchinfo.rma.view.base.hnstmain.performancetemplate.SelectPerformanceTemplateActivity
 import cn.muchinfo.rma.view.base.home.contract.emptyView
 import cn.muchinfo.rma.view.base.home.contract.verticalEmptyView
 import com.blankj.utilcode.util.ConvertUtils
@@ -173,6 +176,7 @@ fun AppCompatActivity.OneListedDialog(
 }
 
 //一口价卖挂牌
+@Suppress("DEPRECATION")
 class OneSellListedUI(
     private val activity: AppCompatActivity,
     private val viewModel: BusinessHallViewModel,
@@ -258,6 +262,46 @@ class OneSellListedUI(
             itemView()
 
             linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+                onThrottleFirstClick {
+                    val intent = Intent()
+                    intent.setClass(context, SelectPerformanceTemplateActivity::class.java)
+                    activity.startActivityForResult(intent,1004)
+                }
+
+                textView {
+                    text = "履约模版"
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    viewModel.selectPerformanceStepData.bindOptional(context) {
+                        text = it?.templatename
+                        textColorInt = R.color.rma_black_33
+                    }
+                    text = "请选择履约模版"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(80)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_more
+                }.lparams(autoSize(36), autoSize(36)) {
+                    marginEnd = autoSize(25)
+                }
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
                     textView {
@@ -573,6 +617,11 @@ class OneSellListedUI(
                             }
                         }
 
+                        if (viewModel.selectPerformanceStepData.value?.autoid.isNullOrEmpty()){
+                            ToastUtils.showLong("请选择履约模版")
+                            return@onThrottleFirstClick
+                        }
+
                         if (onePriceInputEdittext.text.toString().isNullOrEmpty()) {
                             ToastUtils.showLong("请输入挂牌价格")
                             return@onThrottleFirstClick
@@ -620,7 +669,7 @@ class OneSellListedUI(
                                 WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                 TimevalidType = 4,
                                 FirstRatio = 0.0,
-                                PerformanceTemplateID = 0,
+                                PerformanceTemplateID = viewModel.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                 BuyOrSell = 1,
                                 PriceDisplayMode = 1,
                                 CanBargain = 0,
@@ -631,6 +680,7 @@ class OneSellListedUI(
                                 WRStandardID = data.wrstandardid?.toInt() ?: 0
                             ) {
                                 viewModel.controlDialogDisappear.postValue(true)
+                                viewModel.selectPerformanceStepData.postValue(PermancePlanTmpData())
                             }
                         } else {
                             viewModel.requeryWRListingOrderReq(
@@ -649,7 +699,7 @@ class OneSellListedUI(
                                 WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                 TimevalidType = 4,
                                 FirstRatio = 0.0,
-                                PerformanceTemplateID = 0,
+                                PerformanceTemplateID = viewModel.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                 BuyOrSell = 1,
                                 PriceDisplayMode = 1,
                                 CanBargain = 0,
@@ -660,6 +710,7 @@ class OneSellListedUI(
                                 WRStandardID = data.wrstandardid?.toInt() ?: 0
                             ) {
                                 viewModel.controlDialogDisappear.postValue(true)
+                                viewModel.selectPerformanceStepData.postValue(PermancePlanTmpData())
                             }
                         }
                     }
@@ -779,6 +830,46 @@ class OneBuyListedUI(
             itemView()
 
             linearLayout {
+                background = resources.getDrawable(R.color.white)
+                gravity = Gravity.CENTER_VERTICAL
+                onThrottleFirstClick {
+                    val intent = Intent()
+                    intent.setClass(context, SelectPerformanceTemplateActivity::class.java)
+                    activity.startActivityForResult(intent,1004)
+                }
+
+                textView {
+                    text = "履约模版"
+                    textSizeAuto = 34
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(36)
+                }
+
+                textView {
+                    viewModel.selectPerformanceStepData.bindOptional(context) {
+                        text = it?.templatename
+                        textColorInt = R.color.rma_black_33
+                    }
+                    text = "请选择履约模版"
+                    textSizeAuto = 31
+                    textColorInt = R.color.rma_hint_text_color_ccc
+                }.lparams(wrapContent, wrapContent) {
+                    marginStart = autoSize(80)
+                }
+
+                emptyView()
+
+                imageView {
+                    imageResource = R.mipmap.rma_more
+                }.lparams(autoSize(36), autoSize(36)) {
+                    marginEnd = autoSize(25)
+                }
+            }.lparams(matchParent, autoSize(132))
+
+            itemView()
+
+            linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 linearLayout {
                     textView {
@@ -1061,6 +1152,12 @@ class OneBuyListedUI(
                             ToastUtils.showLong("请输入挂牌价格")
                             return@onThrottleFirstClick
                         }
+
+                        if (viewModel.selectPerformanceStepData.value?.autoid.isNullOrEmpty()){
+                            ToastUtils.showLong("请选择履约模版")
+                            return@onThrottleFirstClick
+                        }
+
                         if (onePriceInputEdittext.text.toString().toDouble() == 0.0) {
                             ToastUtils.showLong("挂牌价格不能为零")
                             return@onThrottleFirstClick
@@ -1101,7 +1198,7 @@ class OneBuyListedUI(
                                 WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                 TimevalidType = 4,
                                 FirstRatio = 0.0,
-                                PerformanceTemplateID = 0,
+                                PerformanceTemplateID = viewModel.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                 BuyOrSell = 0,
                                 PriceDisplayMode = 1,
                                 CanBargain = 0,
@@ -1112,6 +1209,7 @@ class OneBuyListedUI(
                                 WRStandardID = data.wrstandardid?.toInt() ?: 0
                             ) {
                                 viewModel.controlDialogDisappear.postValue(true)
+                                viewModel.selectPerformanceStepData.postValue(PermancePlanTmpData())
                             }
                         } else {
                             viewModel.requeryWRListingOrderReq(
@@ -1128,7 +1226,7 @@ class OneBuyListedUI(
                                 WRTradeGoods = WarehouseTradeMI1.WRGoodsInfo.newBuilder().build(),
                                 TimevalidType = 4,
                                 FirstRatio = 0.0,
-                                PerformanceTemplateID = 0,
+                                PerformanceTemplateID = viewModel.selectPerformanceStepData.value?.autoid?.toLong() ?: 0,
                                 BuyOrSell = 0,
                                 PriceDisplayMode = 1,
                                 CanBargain = 0,
@@ -1139,6 +1237,7 @@ class OneBuyListedUI(
                                 WRStandardID = data.wrstandardid?.toInt() ?: 0
                             ) {
                                 viewModel.controlDialogDisappear.postValue(true)
+                                viewModel.selectPerformanceStepData.postValue(PermancePlanTmpData())
                             }
                         }
 

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

@@ -44,6 +44,21 @@ data class ListedData(
         return returnString
     }
 
+    //获取仓库id
+    fun getWarehousename() :String{
+        var returnString = ""
+        FactoryItemsList?.forEach {
+            if (it.dgfactoryitemtypeid == "1"){//1专指仓库
+                it.itemlst?.forEach { data ->
+                    if (data.isSelect == 1){
+                        returnString = data.dgfactoryitemvalue ?: ""
+                    }
+                }
+            }
+        }
+        return returnString
+    }
+
     //商品要素项名称模糊匹配, 逗号隔开, 如 产地1,品牌1,规格12mm
     fun getdgitemname() : String{
         var returnString = ""

RMA/app/src/main/res/layout/layout_tjmd_item_scroll.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="110dp"
+    android:layout_height="45dp"
+    android:gravity="center"
+    android:id="@+id/item_click"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="90dp"
+        android:layout_height="35dp">
+        <TextView
+            android:textSize="12sp"
+            android:gravity="center"
+            android:id="@+id/tv_right_scroll"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:textColor="#AAAAAA" />
+    </LinearLayout>
+
+
+</LinearLayout>