添加了供应商列表和搜索物品分页功能

app/src/main/java/com/sw/inbound/viewmodel/BaseViewModel.kt

@@ -16,6 +16,10 @@ import java.io.IOException
 abstract class BaseViewModel(
     private val repository: RemoteRepository
 ) : ViewModel() {
+
+    /**
+     * 带进度条的请求
+     */
     protected fun launchWithLoading(block: suspend () -> Unit) {
         viewModelScope.launch {
             try {
@@ -30,6 +34,9 @@ abstract class BaseViewModel(
         }
     }
 
+    /**
+     * 不带进度条的请求
+     */
     protected fun launch(block: suspend () -> Unit) {
         viewModelScope.launch() {
             try {

app/src/main/java/com/sw/inbound/viewmodel/PurchaseOrderViewModel.kt

@@ -21,17 +21,45 @@ class PurchaseOrderViewModel @Inject constructor(
     private val _supplierList = MutableStateFlow<List<SupplierInfo?>>(emptyList())
     val supplierList: StateFlow<List<SupplierInfo?>> = _supplierList
 
+    /**
+     * 是否可以加载更多
+     */
+    private val _canLoadMore = MutableStateFlow(true)
+    val canLoadMore: StateFlow<Boolean> = _canLoadMore
 
-    fun getOrderList(pageNum: Int = 0, pageSize: Int = 20) {
-        launchWithLoading {
-            val response = repository.getReceiveList(pageNum, pageSize)
-            if (response.isSuccess()) {
-                response.data?.records?.let {
-                    _supplierList.value = it
+    /**
+     * 是否显示进度条
+     */
+    private val _isMoreLoading = MutableStateFlow(false)
+    val isMoreLoading = _isMoreLoading
+
+
+    /**
+     * 获取采购订单-供应商列表
+     */
+    fun getOrderList(pageNum: Int = 1, pageSize: Int = 5) {
+        if (pageNum != 1) {
+            launch {
+                _isMoreLoading.value = true
+                val response = repository.getReceiveList(pageNum, pageSize)
+                _isMoreLoading.value = false
+                if (response.isSuccess()) {
+                    response.data?.records?.let {
+                        _canLoadMore.value = it.size >= pageSize
+                        _supplierList.value = _supplierList.value + it
+                    }
+                }
+            }
+        } else {
+            launchWithLoading {
+                val response = repository.getReceiveList(pageNum, pageSize)
+                if (response.isSuccess()) {
+                    response.data?.records?.let {
+                        _supplierList.value = it
+                    }
                 }
             }
         }
     }
-
 }
 

app/src/main/java/com/sw/inbound/viewmodel/SelfProcurementViewModel.kt

@@ -77,6 +77,18 @@ class SelfProcurementViewModel @Inject constructor(
      */
     private val _amountUserInput = MutableStateFlow<Boolean>(false)
 
+    /**
+     * 是否可以加载更多
+     */
+    private val _canLoadMore = MutableStateFlow(true)
+    val canLoadMore: StateFlow<Boolean> = _canLoadMore
+
+    /**
+     * 是否显示进度条
+     */
+    private val _isMoreLoading = MutableStateFlow(false)
+    val isMoreLoading = _isMoreLoading
+
     /**
      * 更新全局仓库
      */
@@ -237,15 +249,24 @@ class SelfProcurementViewModel @Inject constructor(
 
     fun searchGoodsInfoList(
         goodsName: String,
-        pageNo: Int = 0,
+        pageNo: Int = 1,
         pageSize: Int = 10
     ) {
         launch {
+            if (pageNo > 1) {
+                _isMoreLoading.value = true
+            }
             val response = repository.searchGoodsInfoList(goodsName, pageNo, pageSize)
+            _isMoreLoading.value = false
             if (response.isSuccess()) {
                 val data = response.data
-                if (data != null) {
-                    _searchListItems.value = data.records ?: emptyList<SearchGoodsInfo.Record>()
+                data?.records?.let {
+                    _canLoadMore.value = data.records.size >= pageSize
+                    if (pageNo > 1) {
+                        _searchListItems.value = _searchListItems.value + data.records
+                    } else {
+                        _searchListItems.value = data.records
+                    }
                 }
             } else {
                 _searchListItems.value = emptyList<SearchGoodsInfo.Record>()