天津麦盾bug处理

RMA/app/src/main/java/cn/muchinfo/rma/view/autoWidget/utils/NumberUtils.java

@@ -174,7 +174,7 @@ public class NumberUtils {
         String s = getZeroPatternString(num);
         DecimalFormat decimalFormat = new DecimalFormat(s);
         String value = decimalFormat.format(Double.parseDouble(doubleDistortion(string)));
-        if(value.equals("-0.0")){
+        if(value.equals("-0.0") || value.equals("-0.00") || value.equals("-0.000") || value.equals("-0.0000")){
             return "0.0";
         }
         return value;

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

@@ -51,11 +51,15 @@ class CDYSOnePriceUI(private val fragment : Fragment, private val viewModel: Tjm
         OnePriceAdapter(fragment.context,"2")
     }
 
+    var marketId: String? = ""
+
+
     @SuppressLint("RtlHardcoded")
     val root = _FrameLayout(fragment.context!!).apply {
         verticalLayout {
-            viewModel.queryysOneOrderQuote(wrstandardid = viewModel.selectWrFtWrstandardData.value?.wrstandardid
-                ?: "",
+            viewModel.queryysOneOrderQuote(
+                marketid = marketId!!,
+                wrstandardid = viewModel.selectWrFtWrstandardData.value?.wrstandardid ?: "",
                 warehouseid = viewModel.getSelectWarehouseOrFactoryid("1"),
                 dgitemname = viewModel.getSelectWarehouseOrFactoryid("2"))
             linearLayout {

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

@@ -208,6 +208,7 @@ class TjmdMarketFragment : BaseFragment<TjmdMarketViewModel>(){
                 }else if (it.auctionwrtype == "1"){//无仓单=仓单预售
                     if (it.listingmode == "1"){//一手价
                         newTabsArray.add(it.marketname ?: "")
+                        cDYSOnePriceUI.marketId = it.marketid
                         uiList.add(cDYSOnePriceUI.root)
                     }else if (it.listingmode == "2"){//浮动价
                         newTabsArray.add(it.marketname ?: "")

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

@@ -904,9 +904,9 @@ class TjmdMarketViewModel : BaseViewModel(){
     /**
      * 查询一口价报价牌
      */
-    fun queryysOneOrderQuote(wrstandardid : String = "",warehouseid : String = "",dgitemname : String = "",deliverymonth : String = ""){
+    fun queryysOneOrderQuote(marketid: String = "" , wrstandardid : String = "",warehouseid : String = "",dgitemname : String = "",deliverymonth : String = ""){
         val params = mutableMapOf<String,String>().apply {
-            put("marketid","17201")
+            put("marketid",marketid)
             put("wrpricetype","1")
             put("haswr","0")
             if (wrstandardid.isNotEmpty()){