From a2f15532fd4b64049be2747f3ed3f87d43608bec Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 01 七月 2024 11:44:42 +0800
Subject: [PATCH] 返回仓库名称
---
models/operation.go | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/models/operation.go b/models/operation.go
index 36b2391..740659d 100644
--- a/models/operation.go
+++ b/models/operation.go
@@ -61,10 +61,11 @@
CheckedBy string `json:"checkedBy" gorm:"type:varchar(255);comment:楠岃瘉鑰匲serId"`
Remark string `json:"remark"`
- WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
- IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
- InventoryDealerType int `json:"inventoryDealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)"`
- InventoryDealer MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
+ WarehouseId int `json:"warehouseId" gorm:"type:int;not null;comment:浠撳簱id"`
+ Warehouse Warehouse `json:"warehouse" gorm:"foreignKey:WarehouseId"`
+ IsInternalOutput bool `json:"isInternalOutput"` //鏄惁璋冩嫧浜х敓鐨勫嚭搴�
+ InventoryDealerType int `json:"inventoryDealerType" gorm:"type:varchar(255);comment:璋冩嫧鍑哄叆搴撳垎绫�(瀵瑰簲dict瀛楀吀琛ㄧ殑ID)"`
+ InventoryDealer MiniDict `json:"inventoryDealer" gorm:"foreignKey:InventoryDealerType;"`
}
OperationSearch struct {
@@ -226,7 +227,14 @@
}
if slf.Preload {
- db = db.Model(&Operation{}).Preload("Details").Preload("Details.Product").Preload("LogisticCompany").Preload("Location").Preload("ToLocation").Preload("Details.FromLocation").Preload("Details.ToLocation").Preload("InventoryDealer")
+ db = db.Model(&Operation{}).Preload("Details").
+ Preload("Details.Product").
+ Preload("LogisticCompany").
+ Preload("Location").
+ Preload("ToLocation").
+ Preload("Details.FromLocation").
+ Preload("Details.ToLocation").
+ Preload("InventoryDealer").Preload("Warehouse")
}
if slf.Disuse {
--
Gitblit v1.8.0