From 2d911d76bffda47005f8a30eb8f3719316bf43c9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 26 六月 2024 16:29:47 +0800
Subject: [PATCH] update doc

---
 models/location.go |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/models/location.go b/models/location.go
index be55274..6bb50a0 100644
--- a/models/location.go
+++ b/models/location.go
@@ -27,6 +27,8 @@
 		NextCount            string                        `json:"nextCount" gorm:"type:varchar(255);comment:涓嬫鐩樼偣"`       //涓嬫鐩樼偣
 		JointName            string                        `json:"jointName" gorm:"type:varchar(255);comment:鎷兼帴鍚嶇О"`       //鎷兼帴鍚嶇О
 		Children             []*Location                   `json:"children" gorm:"-"`
+		WarehouseId          int                           `json:"warehouseId" gorm:"type:int;not null;default:0;comment:浠撳簱ID"` //浠撳簱ID
+		Warehouse            Warehouse                     `json:"warehouse" gorm:"foreignKey:WarehouseId"`                     //浠撳簱
 	}
 
 	LocationSearch struct {
@@ -154,6 +156,7 @@
 		db = db.Where("company_id=?", slf.CompanyId)
 	}
 	if slf.JointName != "" {
+		slf.JointName += "/"
 		db = db.Where("joint_name like ?", slf.JointName+"%")
 	}
 	if len(slf.JointNames) != 0 {
@@ -164,6 +167,10 @@
 		db = db.Where("is_scrap_location = ?", slf.IsScrapLocation)
 	}
 
+	if slf.Preload {
+		db = db.Preload("Warehouse")
+	}
+
 	return db
 }
 

--
Gitblit v1.8.0