实现了部分收货UI。替换为张欢测试服务

2025-07-18 08:49:06 +08:00
parent 5874e4ed9a
commit 4c6fa31787
22 changed files with 282 additions and 137 deletions
@@ -52,8 +52,8 @@ abstract class BaseViewModel(
        if (response.isSuccess()) {
            return true
        }
-        Timber.d("msg = ${response.msg}, code = ${response.code}")
-        ToastUtils.showToast("${response.msg}(${response.code})")
+        Timber.d("msg = ${response.message}, code = ${response.code}")
+        ToastUtils.showToast("${response.message}(${response.code})")
        return false
    }

@@ -71,60 +71,60 @@ abstract class BaseViewModel(
        Timber.d("获取所有字典列表")
        launchWithLoading {
            val response = repository.getGoodsStorageType()
-            if (response.isSuccess()) {
-                Timber.d("getGoodsStorageType data = ${response.data}")
-                response.data?.let {
+            if (parseResponse(response)) {
+                Timber.d("getGoodsStorageType data = ${response.result}")
+                response.result?.let {
 //                    val dictType = DictType(response.data)
                    val list = mutableListOf<DictType>()
-                    for (type in response.data) {
+                    for (type in response.result) {
                        list.add(DictType(type.itemValue!!.toInt(), type.itemText!!))
                    }
                    GlobalData.storageTypeList = list
                }
            } else {
-                Timber.e("getGoodsStorageType msg = ${response.msg}, code = ${response.code}")
+                Timber.e("getGoodsStorageType msg = ${response.message}, code = ${response.code}")
            }
            val response1 = repository.getGoodsType()
-            if (response1.isSuccess()) {
-                Timber.d("getGoodsType data = ${response1.data?.allType}")
-                response1.data?.let {
-                    if (response1.data.allType != null) {
+            if (parseResponse(response1)) {
+                Timber.d("getGoodsType data = ${response1.result?.allType}")
+                response1.result?.let {
+                    if (response1.result.allType != null) {
                        val list = mutableListOf<DictType>()
-                        for (type in response1.data.allType) {
+                        for (type in response1.result.allType) {
                            list.add(DictType(type!!.id!!, type.typeName!!))
                        }
                        GlobalData.goodsTypeList = list
                    }
                }
            } else {
-                Timber.e("getGoodsType msg = ${response1.msg}, code = ${response1.code}")
+                Timber.e("getGoodsType msg = ${response1.message}, code = ${response1.code}")
            }
            val response2 = repository.getDictType(RemoteRepository.TypeEnum.WAREHOUSE)
-            if (response2.isSuccess()) {
-                Timber.d("getDictType WAREHOUSE data = ${response2.data}")
-                response2.data?.let {
-                    GlobalData.warehouseTypeList = response2.data
+            if (parseResponse(response2)) {
+                Timber.d("getDictType WAREHOUSE data = ${response2.result}")
+                response2.result?.let {
+                    GlobalData.warehouseTypeList = response2.result
                }
            } else {
-                Timber.e("getDictType WAREHOUSE msg = ${response2.msg}, code = ${response2.code}")
+                Timber.e("getDictType WAREHOUSE msg = ${response2.message}, code = ${response2.code}")
            }
            val response3 = repository.getDictType(RemoteRepository.TypeEnum.SUPPLIER)
-            if (response3.isSuccess()) {
-                Timber.d("getDictType SUPPLIER  data = ${response3.data}")
-                response3.data?.let {
-                    GlobalData.supplierTypeList = response3.data
+            if (parseResponse(response3)) {
+                Timber.d("getDictType SUPPLIER  data = ${response3.result}")
+                response3.result?.let {
+                    GlobalData.supplierTypeList = response3.result
                }
            } else {
-                Timber.e("getDictType SUPPLIER  msg = ${response3.msg}, code = ${response3.code}")
+                Timber.e("getDictType SUPPLIER  msg = ${response3.message}, code = ${response3.code}")
            }
            val response4 = repository.getDictType(RemoteRepository.TypeEnum.UNIT)
-            if (response4.isSuccess()) {
-                Timber.d("getDictType UNIT data = ${response4.data}")
-                response4.data?.let {
-                    GlobalData.unitTypeList = response4.data
+            if (parseResponse(response4)) {
+                Timber.d("getDictType UNIT data = ${response4.result}")
+                response4.result?.let {
+                    GlobalData.unitTypeList = response4.result
                }
            } else {
-                Timber.e("getDictType UNIT  msg = ${response4.msg}, code = ${response4.code}")
+                Timber.e("getDictType UNIT  msg = ${response4.message}, code = ${response4.code}")
            }
        }
    }
@@ -43,8 +43,8 @@ class PurchaseOrderViewModel @Inject constructor(
                _isMoreLoading.value = true
                val response = repository.getReceiveList(pageNum, pageSize)
                _isMoreLoading.value = false
-                if (response.isSuccess()) {
-                    response.data?.records?.let {
+                if (parseResponse(response)) {
+                    response.result?.records?.let {
                        _canLoadMore.value = it.size >= pageSize
                        _supplierList.value = _supplierList.value + it
                    }
@@ -53,8 +53,8 @@ class PurchaseOrderViewModel @Inject constructor(
        } else {
            launchWithLoading {
                val response = repository.getReceiveList(pageNum, pageSize)
-                if (response.isSuccess()) {
-                    response.data?.records?.let {
+                if (parseResponse(response)) {
+                    response.result?.records?.let {
                        _supplierList.value = it
                    }
                }
@@ -146,8 +146,8 @@ class ReceiptViewModel @Inject constructor(
    fun getReceiveDetail(id: Int) {
        launchWithLoading {
            val response = repository.getReceiveDetail(id)
-            if (response.isSuccess()) {
-                _currentPurchaseInfo.value = response.data
+            if (parseResponse(response)) {
+                _currentPurchaseInfo.value = response.result
                initOrders()
            }
        }
@@ -305,15 +305,9 @@ class ReceiptViewModel @Inject constructor(
    fun partialReceipt(uploadInfo: UploadInfo) {
        launchWithLoading {
            val response = repository.partialReceipt(uploadInfo)
-            if (!response.isSuccess()) {
-                parseResponse(response)
-                return@launchWithLoading
-            }
-            if (response.success == true) {
+            if (parseResponse(response)) {
                ToastUtils.showToast("部分收货成功")
                _receiptResult.value = true
-            } else {
-                ToastUtils.showToast("部分收货失败")
            }
        }
    }
@@ -321,15 +315,9 @@ class ReceiptViewModel @Inject constructor(
    fun confirmReceipt(uploadInfo: UploadInfo) {
        launchWithLoading {
            val response = repository.confirmReceipt(uploadInfo)
-            if (!response.isSuccess()) {
-                parseResponse(response)
-                return@launchWithLoading
-            }
-            if (response.success == true) {
+            if (parseResponse(response)) {
                ToastUtils.showToast("收货成功")
                _receiptResult.value = true
-            } else {
-                ToastUtils.showToast("收货失败")
            }
        }
    }
@@ -107,16 +107,17 @@ class SelfProcurementViewModel @Inject constructor(
            val currentItem = _selectedItem.value

            currentItem?.let { info ->
+                val selectUnitType = currentItem.selectUnitType
                // 用户输入数量后不再通过重量反算
-                if (_countUserInput.value) {
+                if (_countUserInput.value || selectUnitType == null) {
                    _selectedItem.value = info.copy(
                        goodsWeight = weight.toSafeBigDecimal(),
                    )
                    return@startScale
                }

-                val selectUnitType = currentItem.selectUnitType
-                if (selectUnitType == null) return@startScale
+//                val selectUnitType = currentItem.selectUnitType
+//                if (selectUnitType == null) return@startScale

                val consumeValue = selectUnitType.consumeValue?.toDouble() ?: 1.0
                val purchaseValue = selectUnitType.purchaseValue?.toDouble() ?: 1.0
@@ -265,8 +266,8 @@ class SelfProcurementViewModel @Inject constructor(
            }
            val response = repository.searchGoodsInfoList(goodsName, pageNo, pageSize)
            _isMoreLoading.value = false
-            if (response.isSuccess()) {
-                val data = response.data
+            if (parseResponse(response)) {
+                val data = response.result
                data?.records?.let {
                    _canLoadMore.value = data.records.size >= pageSize
                    if (pageNo > 1) {
@@ -334,22 +335,20 @@ class SelfProcurementViewModel @Inject constructor(

        launchWithLoading {
            val uploadResponse = repository.uploadImage(imageUri)
-            if (!uploadResponse.isSuccess()) {
-                parseResponse(uploadResponse)
+            if (!parseResponse(uploadResponse)) {
                return@launchWithLoading
            }
 //            ToastUtils.showToast("图片上传成功，${uploadResponse.data}")
            GlobalData.imageUri = null
-            _goodsAddParam.value.relativeUrl = uploadResponse.data
+            _goodsAddParam.value.relativeUrl = uploadResponse.result
            val response = repository.selfPurchaseGoodsAdd(_goodsAddParam.value)
-            if (!response.isSuccess()) {
-                parseResponse(response)
+            if (!parseResponse(response)) {
                return@launchWithLoading
            }
            FileUtils.deleteFileWithUri(context = ContextUtils.getAppContext(), uri = imageUri)
            _showAddProductDialog.value = false
            _goodsAddParam.value = GoodsAddParam()
-            val searchFirst = response.data!!.records?.get(0)
+            val searchFirst = response.result!!.records?.get(0)
            searchFirst?.let {
                updateSelectedItemWithSearch(searchFirst)
            }
@@ -369,6 +368,8 @@ class SelfProcurementViewModel @Inject constructor(
            val response = repository.selfPurchaseWarehousing(_purchaseList.value)
            if (parseResponse(response)) {
                _addToWarehouseResult.value = true
+            } else {
+                _addToWarehouseResult.value = false
            }
        }
    }
@@ -38,10 +38,11 @@ class UserViewModel @Inject constructor(
    fun login(userName: String, password: String) = launchWithLoading {
        val loginParam = LoginParam(userName = userName, password = password)
        val response = repo.login(loginParam)
-        if (response.isSuccess()) {
-            _user.value = response.data
-            saveToken(response.data)
-            response.data?.token
+        if (parseResponse(response)) {
+            SPUtil.getInstance().put(GlobalKey.KEY_USER_NAME, userName)
+            _user.value = response.result
+            saveToken(response.result)
+            response.result?.token
        }
    }