diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt index bf1842e..32f3305 100644 --- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt @@ -78,6 +78,7 @@ abstract class GoodsListActivity : BaseActivity() { private const val TAG = "GoodsListActivity" public const val ID = "id" public const val SUPPLIER_ID = "supplierId" + public const val PUR_CODE = "purCode" public const val IS_RECEIPT_PAGE = "isReceiptPage" // public const val IS_NEW_RECEIPT = "isNewReceipt" @@ -91,6 +92,7 @@ abstract class GoodsListActivity : BaseActivity() { // var isNewReceipt: Boolean = false var id: String = "" var supplierId: String = "" + var purCode: String = "" lateinit var binding: ActivityGoodsListBinding val receiptViewModel: ReceiptViewModel by viewModels() val userViewModel: UserViewModel by viewModels() @@ -116,6 +118,7 @@ abstract class GoodsListActivity : BaseActivity() { //isNewReceipt = intent.getBooleanExtra(IS_NEW_RECEIPT, false) id = intent.getStringExtra(ID) ?: "" supplierId = intent.getStringExtra(SUPPLIER_ID) ?: "" + purCode = intent.getStringExtra(PUR_CODE) ?: "" replaceIncludeContent() initRecyclerView() @@ -647,6 +650,7 @@ abstract class GoodsListActivity : BaseActivity() { val uploadInfo = UploadInfo( id = id, supplierId = supplierId, + purCode = purCode, receiveGoodsInfos = goodsList ) logInfo("receiptSubmit确认收货提交数据:${uploadInfo.toJsonString()}") diff --git a/app/src/main/java/com/sw/inbound/activity/PurchaseOrderActivity.kt b/app/src/main/java/com/sw/inbound/activity/PurchaseOrderActivity.kt index c4a78e3..9a1ce2b 100644 --- a/app/src/main/java/com/sw/inbound/activity/PurchaseOrderActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/PurchaseOrderActivity.kt @@ -41,6 +41,7 @@ class PurchaseOrderActivity : BaseActivity() { startActivity { putExtra(GoodsListActivity.ID, item.id) putExtra(GoodsListActivity.SUPPLIER_ID, item.supplierId) + putExtra(GoodsListActivity.PUR_CODE, item.purCode) putExtra(GoodsListActivity.IS_RECEIPT_PAGE, true) //putExtra(GoodsListActivity.IS_NEW_RECEIPT, false) } 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 91b6647..d1542e4 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 @@ -18,6 +18,10 @@ data class UploadInfo( * 供应商id */ var supplierId: String? = null, + /** + * 采购单号 + */ + var purCode: String? = null, /** * * 物品信息 【全部收货使用】