From 32bc730a215320c0af4a6114db28d4d8e06ad329 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Thu, 10 Jul 2025 17:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sw/inbound/model/request/UploadInfo.kt    |  9 +++++++--
 .../com/sw/inbound/ui/page/ReceiptProductScreen.kt     | 10 ++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt b/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt
index c8efbf6..ccb49ce 100644
--- a/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt
+++ b/app/src/main/java/com/sw/inbound/model/request/UploadInfo.kt
@@ -20,9 +20,14 @@ data class UploadInfo(
      */
     var supplierId: Int? = null,
     /**
-     * 物品信息
+     *
+     * 物品信息  【全部收货使用】
      */
-    var receiveGoodsInfos: List<GoodsInfo>
+    var receiveGoodsInfos: List<GoodsInfo> = emptyList<GoodsInfo>(),
+    /**
+     * 物品信息  【部分收货使用】
+     */
+    var receiveGoodsInfoList: List<GoodsInfo> = emptyList<GoodsInfo>()
 ) : Parcelable
 
 /**
diff --git a/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt b/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt
index adf18a8..6560d1e 100644
--- a/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt
+++ b/app/src/main/java/com/sw/inbound/ui/page/ReceiptProductScreen.kt
@@ -135,10 +135,12 @@ fun ReceiptProductScreen(
         }, onConfirmClick = { isFull ->
             Timber.d(if (isFull) "确认收货" else "部分收货")
             viewModel.updateReceiptDialog(false)
-            val uploadInfo = UploadInfo(id = id, receiveGoodsInfos = orders)
+            val uploadInfo = UploadInfo(id = id)
             if (isFull) {
+                uploadInfo.receiveGoodsInfos = orders
                 viewModel.confirmReceipt(uploadInfo)
             } else {
+                uploadInfo.receiveGoodsInfoList = orders
                 uploadInfo.supplierId = supplierId
                 viewModel.partialReceipt(uploadInfo)
             }
@@ -156,7 +158,7 @@ fun ReceiptLeftView(
     viewModel: ReceiptViewModel,
     id: Int
 ) {
-    val warehouseTypeList = GlobalData.warehouseTypeList // receiptViewModel.getStoreList()
+    val warehouseTypeList = GlobalData.warehouseTypeList
     val currentPurchaseInfo by viewModel.currentPurchaseInfo.collectAsState()
 
     LaunchedEffect(id) {
@@ -555,7 +557,7 @@ private fun ReceiptProductEditView(
 
             RowInputLayout(
                 label = "收货单价",
-                value = selectedItem!!.recUnitPriceTaxInTemp,
+                value = selectedItem!!.recUnitPriceTaxInTemp ?: "",
                 trailingLabel = "元",
                 isInitUpdate = true,
                 onValueChange = { value ->
@@ -572,7 +574,7 @@ private fun ReceiptProductEditView(
             )
             RowInputLayout(
                 label = "收货金额",
-                value = selectedItem!!.recPriceExItemTemp,
+                value = selectedItem!!.recPriceExItemTemp ?: "",
                 trailingLabel = "元",
                 isInitUpdate = true,
                 onValueChange = { value ->