天津麦盾 解决通过买卖大厅 买大厅导致的仓单选择问题

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

@@ -316,7 +316,9 @@ class FloatSellListedUI(
             linearLayout {
                 gravity = Gravity.CENTER_VERTICAL
                 onThrottleFirstClick {
-                    activity.creatHnstSpotDetailSheetDialog("请选择现货仓单", viewModel.detailsWarehouseContentDataList.value ?: arrayListOf()) {
+                    activity.creatHnstSpotDetailSheetDialog("请选择现货仓单",
+                        viewModel.detailsWarehouseContentDataList.value ?: arrayListOf()
+                    ) {
                         selectSpotDetailsData.postValue(this)
                     }
                 }

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

@@ -962,7 +962,14 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                     onThrottleFirstClick {
                         creatHnstSpotDetailSheetDialog(
                             "请选择现货仓单",
-                            viewModel.detailsWarehouseContentDataList.value ?: arrayListOf<HoldLBData>()
+                            if (data.wrstandardid != null && data.warehouseid != null && data.wrgoodsname != null) {
+                                (viewModel.detailsWarehouseContentDataList.value
+                                    ?: arrayListOf<HoldLBData>()).filter {
+                                    it.wrstandardid == data.wrstandardid && it.warehouseid == data.warehouseid && it.wrtypename == data.wrgoodsname
+                                }
+                            } else {
+                                viewModel.detailsWarehouseContentDataList.value ?: arrayListOf()
+                            }
                         ) {
                             selectSpotDetailsData.postValue(this)
                         }
@@ -1540,7 +1547,14 @@ class BusinessHallActivity : BaseActivity<BusinessHallViewModel>() {
                         onThrottleFirstClick {
                             creatHnstSpotDetailSheetDialog(
                                 "请选择现货仓单",
-                                viewModel.detailsWarehouseContentDataList.value ?: arrayListOf<HoldLBData>()
+                                if (data.wrstandardid != null && data.warehouseid != null && data.wrgoodsname != null) {
+                                    (viewModel.detailsWarehouseContentDataList.value
+                                        ?: arrayListOf<HoldLBData>()).filter {
+                                        it.wrstandardid == data.wrstandardid && it.warehouseid == data.warehouseid && it.wrtypename == data.wrgoodsname
+                                    }
+                                } else {
+                                    viewModel.detailsWarehouseContentDataList.value ?: arrayListOf()
+                                }
                             ) {
                                 selectSpotDetailsData.postValue(this)
                             }