入库单数据提交入库新增采购单号字段purCode

This commit is contained in:
2026-05-11 18:20:35 +08:00
parent 79f58a36e3
commit 07e0a1996f
3 changed files with 9 additions and 0 deletions
@@ -78,6 +78,7 @@ abstract class GoodsListActivity : BaseActivity() {
private const val TAG = "GoodsListActivity" private const val TAG = "GoodsListActivity"
public const val ID = "id" public const val ID = "id"
public const val SUPPLIER_ID = "supplierId" public const val SUPPLIER_ID = "supplierId"
public const val PUR_CODE = "purCode"
public const val IS_RECEIPT_PAGE = "isReceiptPage" public const val IS_RECEIPT_PAGE = "isReceiptPage"
// public const val IS_NEW_RECEIPT = "isNewReceipt" // public const val IS_NEW_RECEIPT = "isNewReceipt"
@@ -91,6 +92,7 @@ abstract class GoodsListActivity : BaseActivity() {
// var isNewReceipt: Boolean = false // var isNewReceipt: Boolean = false
var id: String = "" var id: String = ""
var supplierId: String = "" var supplierId: String = ""
var purCode: String = ""
lateinit var binding: ActivityGoodsListBinding lateinit var binding: ActivityGoodsListBinding
val receiptViewModel: ReceiptViewModel by viewModels() val receiptViewModel: ReceiptViewModel by viewModels()
val userViewModel: UserViewModel by viewModels() val userViewModel: UserViewModel by viewModels()
@@ -116,6 +118,7 @@ abstract class GoodsListActivity : BaseActivity() {
//isNewReceipt = intent.getBooleanExtra(IS_NEW_RECEIPT, false) //isNewReceipt = intent.getBooleanExtra(IS_NEW_RECEIPT, false)
id = intent.getStringExtra(ID) ?: "" id = intent.getStringExtra(ID) ?: ""
supplierId = intent.getStringExtra(SUPPLIER_ID) ?: "" supplierId = intent.getStringExtra(SUPPLIER_ID) ?: ""
purCode = intent.getStringExtra(PUR_CODE) ?: ""
replaceIncludeContent() replaceIncludeContent()
initRecyclerView() initRecyclerView()
@@ -647,6 +650,7 @@ abstract class GoodsListActivity : BaseActivity() {
val uploadInfo = UploadInfo( val uploadInfo = UploadInfo(
id = id, id = id,
supplierId = supplierId, supplierId = supplierId,
purCode = purCode,
receiveGoodsInfos = goodsList receiveGoodsInfos = goodsList
) )
logInfo("receiptSubmit确认收货提交数据:${uploadInfo.toJsonString()}") logInfo("receiptSubmit确认收货提交数据:${uploadInfo.toJsonString()}")
@@ -41,6 +41,7 @@ class PurchaseOrderActivity : BaseActivity() {
startActivity<ReceiptActivity> { startActivity<ReceiptActivity> {
putExtra(GoodsListActivity.ID, item.id) putExtra(GoodsListActivity.ID, item.id)
putExtra(GoodsListActivity.SUPPLIER_ID, item.supplierId) putExtra(GoodsListActivity.SUPPLIER_ID, item.supplierId)
putExtra(GoodsListActivity.PUR_CODE, item.purCode)
putExtra(GoodsListActivity.IS_RECEIPT_PAGE, true) putExtra(GoodsListActivity.IS_RECEIPT_PAGE, true)
//putExtra(GoodsListActivity.IS_NEW_RECEIPT, false) //putExtra(GoodsListActivity.IS_NEW_RECEIPT, false)
} }
@@ -18,6 +18,10 @@ data class UploadInfo(
* 供应商id * 供应商id
*/ */
var supplierId: String? = null, var supplierId: String? = null,
/**
* 采购单号
*/
var purCode: String? = null,
/** /**
* *
* 物品信息 【全部收货使用】 * 物品信息 【全部收货使用】