首页下方商品排序修正

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

@@ -65,10 +65,22 @@ class TjmdHomeViewModel : BaseViewModel(){
         //组装掉期商品
         val sonlist = arrayListOf<GoodsInfo>()
         val allList = DataBase.getInstance().goodsInfoDao().all
+        val deliveryRelationList = GlobalDataCollection.instance?.quoteGoodsListDataArrayList
         //需要知道掉期trademodel
-        allList.forEach {data ->
-            if (data.trademode == 46 && data.goodsstatus == 3){
-                sonlist.add(data)
+        if(deliveryRelationList != null){
+            deliveryRelationList?.forEach{ relationData ->
+                var goodsInfo = allList.find {
+                    relationData.goodsid == it.goodsid.toString()
+                }
+                if(goodsInfo != null && goodsInfo.goodsstatus == 3 && goodsInfo.trademode == 46){
+                    sonlist.add(goodsInfo)
+                }
+            }
+        }else {
+            allList.forEach { data ->
+                if (data.trademode == 46 && data.goodsstatus == 3) {
+                    sonlist.add(data)
+                }
             }
         }
         sonItemList.postValue(sonlist)