From 2b3b678a0e0156e68415aa287fdf85d05583a5b4 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期四, 21 九月 2023 15:10:08 +0800
Subject: [PATCH] 1.修改出入库列表显示异常的问题

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

diff --git a/models/location.go b/models/location.go
index 4c0338c..19e592b 100644
--- a/models/location.go
+++ b/models/location.go
@@ -11,17 +11,17 @@
 	// Location 浣嶇疆
 	Location struct {
 		WmsModel
-		Id                   int                           `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
-		Name                 string                        `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О
-		ParentId             string                        `json:"parentId" gorm:"type:varchar(255)"`                         //涓婄骇id
-		CompanyId            int                           `json:"companyId" gorm:"type:int"`                                 //鍏徃id
-		Company              Company                       `json:"company" gorm:"foreignKey:CompanyId"`                       //鍏徃
-		Type                 constvar.LocationType         `json:"type" gorm:"type:int(11);comment:浣嶇疆绫诲瀷"`                     //浣嶇疆绫诲瀷
-		CountFrequency       int                           `json:"countFrequency" gorm:"type:tinyint;comment:鐩樼偣棰戠巼锛堝ぉ锛�"`        //鐩樼偣棰戠巼锛堝ぉ锛�
-		IsScrapLocation      bool                          `json:"isScrapLocation" gorm:"type:tinyint;comment:鏄惁鎶ュ簾浣嶇疆"`        //鏄惁鎶ュ簾浣嶇疆
-		IsReturnLocation     bool                          `json:"isReturnLocation" gorm:"type:tinyint;comment:鏄惁閫�璐т綅缃�"`       //鏄惁閫�璐т綅缃�
-		ReplenishLocation    bool                          `json:"replenishLocation" gorm:"type:tinyint;comment:鏄惁琛ュ厖浣嶇疆"`      //鏄惁琛ュ厖浣嶇疆
-		ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:涓嬫灦绛栫暐"`     //涓嬫灦绛栫暐
+		Id        int    `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"`
+		Name      string `json:"name" gorm:"index;type:varchar(255);not null;comment:浣嶇疆鍚嶇О"` //浣嶇疆鍚嶇О
+		ParentId  string `json:"parentId" gorm:"type:varchar(255)"`                         //涓婄骇id
+		CompanyId int    `json:"companyId" gorm:"type:int"`                                 //鍏徃id
+		//Company              Company                       `json:"company" gorm:"foreignKey:CompanyId"`                       //鍏徃
+		Type                 constvar.LocationType         `json:"type" gorm:"type:int(11);comment:浣嶇疆绫诲瀷"`                 //浣嶇疆绫诲瀷
+		CountFrequency       int                           `json:"countFrequency" gorm:"type:tinyint;comment:鐩樼偣棰戠巼锛堝ぉ锛�"`    //鐩樼偣棰戠巼锛堝ぉ锛�
+		IsScrapLocation      bool                          `json:"isScrapLocation" gorm:"type:tinyint;comment:鏄惁鎶ュ簾浣嶇疆"`    //鏄惁鎶ュ簾浣嶇疆
+		IsReturnLocation     bool                          `json:"isReturnLocation" gorm:"type:tinyint;comment:鏄惁閫�璐т綅缃�"`   //鏄惁閫�璐т綅缃�
+		ReplenishLocation    bool                          `json:"replenishLocation" gorm:"type:tinyint;comment:鏄惁琛ュ厖浣嶇疆"`  //鏄惁琛ュ厖浣嶇疆
+		ForceRemovalStrategy constvar.ForceRemovalStrategy `json:"forceRemovalStrategy" gorm:"type:tinyint;comment:涓嬫灦绛栫暐"` //涓嬫灦绛栫暐
 	}
 
 	LocationSearch struct {
@@ -59,8 +59,8 @@
 	return slf
 }
 
-func (slf *LocationSearch) SetID(id int) *LocationSearch {
-	slf.Id = id
+func (slf *LocationSearch) SetID(ID int) *LocationSearch {
+	slf.Id = ID
 	return slf
 }
 func (slf *LocationSearch) SetParents(ids []string) *LocationSearch {
@@ -101,8 +101,8 @@
 func (slf *LocationSearch) build() *gorm.DB {
 	var db = slf.Orm.Table(slf.TableName())
 
-	if slf.Id != 0 {
-		db = db.Where("id = ?", slf.Id)
+	if slf.ID != 0 {
+		db = db.Where("id = ?", slf.ID)
 	}
 
 	if slf.Order != "" {

--
Gitblit v1.8.0